cc-wrapper: Remove stdenv.is* for targetPlatform.is*

Modify bootstrapping stdenvs to make sure `targetPlatform` also passed.
This commit is contained in:
John Ericson
2017-06-22 17:52:27 -04:00
committed by John Ericson
parent 8f970d09fe
commit c4ba2e3ef6
6 changed files with 13 additions and 5 deletions
+2
View File
@@ -73,6 +73,7 @@ in rec {
nativeTools = true;
nativePrefix = bootstrapTools;
nativeLibc = false;
targetPlatform = localSystem;
libc = last.pkgs.darwin.Libsystem;
isClang = true;
cc = { name = "clang-9.9.9"; outPath = bootstrapTools; };
@@ -295,6 +296,7 @@ in rec {
inherit shell;
nativeTools = false;
nativeLibc = false;
targetPlatform = localSystem;
inherit (pkgs) coreutils binutils gnugrep;
inherit (pkgs.darwin) dyld;
cc = pkgs.llvmPackages.clang-unwrapped;
+1
View File
@@ -77,6 +77,7 @@ let inherit (localSystem) system; in
nativeTools = true;
nativePrefix = "/usr";
nativeLibc = true;
targetPlatform = localSystem;
inherit (prevStage) stdenv;
cc = {
name = "clang-9.9.9";
+2
View File
@@ -76,6 +76,7 @@ let
else lib.makeOverridable (import ../../build-support/cc-wrapper) {
nativeTools = false;
nativeLibc = false;
targetPlatform = localSystem;
cc = prevStage.gcc-unwrapped;
isGNU = true;
libc = prevStage.glibc;
@@ -239,6 +240,7 @@ in
nativeTools = false;
nativeLibc = false;
isGNU = true;
targetPlatform = localSystem;
cc = prevStage.gcc-unwrapped;
libc = self.glibc;
inherit (self) stdenv binutils coreutils gnugrep;
+1
View File
@@ -125,6 +125,7 @@ in
"i686-solaris" = "/usr/gnu";
"x86_64-solaris" = "/opt/local/gcc47";
}.${system} or "/usr";
targetPlatform = localSystem;
inherit stdenv;
};
+1
View File
@@ -30,6 +30,7 @@ bootStages ++ [
nativeTools = false;
nativePrefix = stdenv.lib.optionalString hostPlatform.isSunOS "/usr";
nativeLibc = true;
targetPlatform = localSystem;
inherit stdenv;
inherit (prevStage) binutils coreutils gnugrep;
cc = prevStage.gcc.cc;