cctools: fixup gnu-config detection
Use autoreconfHook instead of preConfigure autogen.sh. This avoids getting the bad version of the gnu-config script and makes the newish iOS triples work.
This commit is contained in:
parent
848d4a08a0
commit
fa383dcb7c
@ -30,12 +30,7 @@ let
|
|||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ autoconf automake ]
|
nativeBuildInputs = [ autoconf automake libtool autoreconfHook ];
|
||||||
|
|
||||||
# TODO: remove on next hash change, libtool is unnecessary with autoreconfHook
|
|
||||||
++ stdenv.lib.optional (stdenv.targetPlatform == stdenv.hostPlatform) libtool
|
|
||||||
|
|
||||||
++ [ autoreconfHook ];
|
|
||||||
buildInputs = [ libuuid ]
|
buildInputs = [ libuuid ]
|
||||||
++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ]
|
++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ]
|
||||||
++ stdenv.lib.optional enableTapiSupport libtapi;
|
++ stdenv.lib.optional enableTapiSupport libtapi;
|
||||||
@ -89,12 +84,6 @@ let
|
|||||||
cd cctools
|
cd cctools
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# TODO: this builds an ld without support for LLVM's LTO. We need to teach it, but that's rather
|
|
||||||
# hairy to handle during bootstrap. Perhaps it could be optional?
|
|
||||||
preConfigure = ''
|
|
||||||
sh autogen.sh
|
|
||||||
'';
|
|
||||||
|
|
||||||
preInstall = ''
|
preInstall = ''
|
||||||
pushd include
|
pushd include
|
||||||
make DSTROOT=$out/include RC_OS=common install
|
make DSTROOT=$out/include RC_OS=common install
|
||||||
|
Loading…
x
Reference in New Issue
Block a user