Merge branch 'staging' into master

2017-07-08 22:22:17 +02:00
parent 800d44984f 7e3a1a58cf
commit 980346592c
34 changed files with 247 additions and 102 deletions
@@ -76,6 +76,11 @@ let
             else lib.makeOverridable (import ../../build-support/cc-wrapper) {
          nativeTools = false;
          nativeLibc = false;
+          buildPackages = lib.optionalAttrs (prevStage ? stdenv) {
+            inherit (prevStage) stdenv;
+          };
+          hostPlatform = localSystem;
+          targetPlatform = localSystem;
          cc = prevStage.gcc-unwrapped;
          isGNU = true;
          libc = prevStage.glibc;
@@ -236,6 +241,11 @@ in
        nativeTools = false;
        nativeLibc = false;
        isGNU = true;
+        buildPackages = {
+          inherit (prevStage) stdenv;
+        };
+        hostPlatform = localSystem;
+        targetPlatform = localSystem;
        cc = prevStage.gcc-unwrapped;
        libc = self.glibc;
        inherit (self) stdenv binutils coreutils gnugrep;