ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 20:02:14 +03:00
Code Issues Projects Releases Wiki Activity

cctools: fixup gnu-config detection

Browse Source 
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:
Matthew Bauer 2019-11-26 16:41:18 -05:00
parent 848d4a08a0
commit fa383dcb7c
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/os-specific/darwin/cctools/port.nix
View File

@ -30,12 +30,7 @@ let
outputs = [ "out" "dev" ];
nativeBuildInputs = [ autoconf automake ]
# TODO: remove on next hash change, libtool is unnecessary with autoreconfHook
++ stdenv.lib.optional (stdenv.targetPlatform == stdenv.hostPlatform) libtool
++ [ autoreconfHook ];
nativeBuildInputs = [ autoconf automake libtool autoreconfHook ];
buildInputs = [ libuuid ]
++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ]
++ stdenv.lib.optional enableTapiSupport libtapi;
@ -89,12 +84,6 @@ let
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 = ''
pushd include
make DSTROOT=$out/include RC_OS=common install