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/linux | |
parent | 0d3d2a01d20d88dde3696ead43c557c1f3043ee7 (diff) | |
download | nixlib-d349f9a34006cc484b5e7509a3f227d52d6e2a5d.tar nixlib-d349f9a34006cc484b5e7509a3f227d52d6e2a5d.tar.gz nixlib-d349f9a34006cc484b5e7509a3f227d52d6e2a5d.tar.bz2 nixlib-d349f9a34006cc484b5e7509a3f227d52d6e2a5d.tar.lz nixlib-d349f9a34006cc484b5e7509a3f227d52d6e2a5d.tar.xz nixlib-d349f9a34006cc484b5e7509a3f227d52d6e2a5d.tar.zst nixlib-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/linux')
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index e79ec48e9f42..a114ab609e6c 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -84,7 +84,7 @@ let libc = prevStage.glibc; inherit (prevStage) binutils coreutils gnugrep; name = name; - stdenv = prevStage.ccWrapperStdenv; + stdenvNoCC = prevStage.ccWrapperStdenv; }; extraAttrs = { @@ -244,7 +244,7 @@ in }; cc = prevStage.gcc-unwrapped; libc = self.glibc; - inherit (self) stdenv binutils coreutils gnugrep; + inherit (self) stdenvNoCC binutils coreutils gnugrep; name = ""; shell = self.bash + "/bin/bash"; }; |