diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-04-30 23:35:21 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-01 22:31:37 -0400 |
| commit | 4b3cc9ed87a0c90898950fc1fa94d968acda1bed (patch) | |
| tree | ad5aeaaf15608b9ea1f82568c88381ca378845db /pkgs/os-specific/darwin/cctools | |
| parent | 60771af5b6fc183aa354ed95e4df32c497382414 (diff) | |
| download | nixpkgs-4b3cc9ed87a0c90898950fc1fa94d968acda1bed.tar nixpkgs-4b3cc9ed87a0c90898950fc1fa94d968acda1bed.tar.gz nixpkgs-4b3cc9ed87a0c90898950fc1fa94d968acda1bed.tar.bz2 nixpkgs-4b3cc9ed87a0c90898950fc1fa94d968acda1bed.tar.lz nixpkgs-4b3cc9ed87a0c90898950fc1fa94d968acda1bed.tar.xz nixpkgs-4b3cc9ed87a0c90898950fc1fa94d968acda1bed.tar.zst nixpkgs-4b3cc9ed87a0c90898950fc1fa94d968acda1bed.zip | |
cctools: Cleanup `useOld` conditions slightly
60771af5b6fc183aa354ed95e4df32c497382414 jumped through some hoops in order to avoid a mass-rebuild.
Diffstat (limited to 'pkgs/os-specific/darwin/cctools')
| -rw-r--r-- | pkgs/os-specific/darwin/cctools/port.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index d8abdc2c6f8..24f21b498aa 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -108,17 +108,15 @@ let # include_next "unistd.h" #endif EOF - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' cctools/autogen.sh - '' + stdenv.lib.optionalString useOld '' + cd cctools + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' autogen.sh ''; # 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 = stdenv.lib.optionalString (!useOld) '' - cd cctools - '' + '' + preConfigure = '' sh autogen.sh ''; |