Merge remote-tracking branch 'upstream/master' into staging

That way the tarball job succeeds
2017-08-21 18:42:57 -04:00
parent 221f5f00e3 c035711072
commit 0135e61b4c
122 changed files with 1611 additions and 264 deletions
@@ -79,8 +79,6 @@ let
          buildPackages = lib.optionalAttrs (prevStage ? stdenv) {
            inherit (prevStage) stdenv;
          };
-          hostPlatform = localSystem;
-          targetPlatform = localSystem;
          cc = prevStage.gcc-unwrapped;
          isGNU = true;
          libc = prevStage.glibc;
@@ -244,8 +242,6 @@ in
        buildPackages = {
          inherit (prevStage) stdenv;
        };
-        hostPlatform = localSystem;
-        targetPlatform = localSystem;
        cc = prevStage.gcc-unwrapped;
        libc = self.glibc;
        inherit (self) stdenv binutils coreutils gnugrep;