diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-12-30 18:16:22 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-12-30 18:16:22 -0500 |
| commit | c1fb358a78862c7ffb90f6f7a319935fb73039b4 (patch) | |
| tree | 433252ea1ce9c088912404088701b27d812b7315 /pkgs/stdenv | |
| parent | 9cbbe2b00f91b699a887b6844414c2612f82d85f (diff) | |
| parent | 6078f094c638faabc63cffe285dc91af4e04a741 (diff) | |
| download | nixpkgs-c1fb358a78862c7ffb90f6f7a319935fb73039b4.tar nixpkgs-c1fb358a78862c7ffb90f6f7a319935fb73039b4.tar.gz nixpkgs-c1fb358a78862c7ffb90f6f7a319935fb73039b4.tar.bz2 nixpkgs-c1fb358a78862c7ffb90f6f7a319935fb73039b4.tar.lz nixpkgs-c1fb358a78862c7ffb90f6f7a319935fb73039b4.tar.xz nixpkgs-c1fb358a78862c7ffb90f6f7a319935fb73039b4.tar.zst nixpkgs-c1fb358a78862c7ffb90f6f7a319935fb73039b4.zip | |
Merge remote-tracking branch 'obsidian/ghcjs-cross-without-cc-common' into ghcjs-cross-without-cc
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/booter.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix index 8a574652204..51d617354e8 100644 --- a/pkgs/stdenv/booter.nix +++ b/pkgs/stdenv/booter.nix @@ -126,7 +126,11 @@ stageFuns: let if buildPackages.stdenv.cc.isClang or false then buildPackages.clang else buildPackages.gcc - else buildPackages.stdenv.cc; + else + # This will blow up if anything uses it, but that's OK. The `if + # buildPackages.stdenv.cc.isClang then ... else ...` would blow up + # everything, so we make sure to avoid that. + buildPackages.stdenv.cc; }; in dfold folder postStage (_: {}) withAllowCustomOverrides |