diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-11-26 16:41:18 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-11-27 10:04:32 -0500 |
| commit | fa383dcb7c33022bb7409c3ef036c57527441ab3 (patch) | |
| tree | 89b904d069c51b577078d224276bfa19d5deb1b4 /pkgs/os-specific/darwin/cctools | |
| parent | 848d4a08a0b5aa0af8723ae1c98b32c807310245 (diff) | |
| download | nixlib-fa383dcb7c33022bb7409c3ef036c57527441ab3.tar nixlib-fa383dcb7c33022bb7409c3ef036c57527441ab3.tar.gz nixlib-fa383dcb7c33022bb7409c3ef036c57527441ab3.tar.bz2 nixlib-fa383dcb7c33022bb7409c3ef036c57527441ab3.tar.lz nixlib-fa383dcb7c33022bb7409c3ef036c57527441ab3.tar.xz nixlib-fa383dcb7c33022bb7409c3ef036c57527441ab3.tar.zst nixlib-fa383dcb7c33022bb7409c3ef036c57527441ab3.zip | |
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.
Diffstat (limited to 'pkgs/os-specific/darwin/cctools')
| -rw-r--r-- | pkgs/os-specific/darwin/cctools/port.nix | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 4f350f4d6833..1aee5c8c35e9 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -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 |