diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-20 11:07:52 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-26 14:08:21 -0400 |
| commit | d349f9a34006cc484b5e7509a3f227d52d6e2a5d (patch) | |
| tree | 69d187767ba311e275115b767680081c2b9b5f96 /pkgs/stdenv/native | |
| parent | 0d3d2a01d20d88dde3696ead43c557c1f3043ee7 (diff) | |
| download | nixpkgs-d349f9a34006cc484b5e7509a3f227d52d6e2a5d.tar nixpkgs-d349f9a34006cc484b5e7509a3f227d52d6e2a5d.tar.gz nixpkgs-d349f9a34006cc484b5e7509a3f227d52d6e2a5d.tar.bz2 nixpkgs-d349f9a34006cc484b5e7509a3f227d52d6e2a5d.tar.lz nixpkgs-d349f9a34006cc484b5e7509a3f227d52d6e2a5d.tar.xz nixpkgs-d349f9a34006cc484b5e7509a3f227d52d6e2a5d.tar.zst nixpkgs-d349f9a34006cc484b5e7509a3f227d52d6e2a5d.zip | |
cc-wrapper: Use stdenvNoCC to build
cc-wrapper may wrap a cc-compiler, but it doesn't need one to build itself. (c.f. expand-response-params is a separate derivation.) This helps avoid cycles on the cross stuff, in addition to removing a useless dependency edge. I could have been super careful with overrides in the stdenv to avoid the mass rebuild, but I don't think it's worth it.
Diffstat (limited to 'pkgs/stdenv/native')
| -rw-r--r-- | pkgs/stdenv/native/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 9ecb56028bc..558a77281ed 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -117,6 +117,7 @@ in cc = null; fetchurl = null; }; + stdenvNoCC = stdenv; cc = import ../../build-support/cc-wrapper { name = "cc-native"; @@ -126,7 +127,7 @@ in "i686-solaris" = "/usr/gnu"; "x86_64-solaris" = "/opt/local/gcc47"; }.${system} or "/usr"; - inherit stdenv; + inherit stdenvNoCC; }; fetchurl = import ../../build-support/fetchurl { |