Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.

Commit

Permalink
cctools: fixup gnu-config detection
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
matthewbauer committed Nov 27, 2019
1 parent 848d4a0 commit fa383dc
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions pkgs/os-specific/darwin/cctools/port.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit fa383dc

Please sign in to comment.