From fa383dcb7c33022bb7409c3ef036c57527441ab3 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 26 Nov 2019 16:41:18 -0500 Subject: [PATCH] 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. --- pkgs/os-specific/darwin/cctools/port.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 4f350f4d683..1aee5c8c35e 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