diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-21 18:42:57 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-21 18:42:57 -0400 |
| commit | 0135e61b4c59357e01e0fda713e95402ea3a443c (patch) | |
| tree | daf7de4554407d52a44c94814d216dc3f16beb9a /pkgs/stdenv/linux | |
| parent | 221f5f00e30870dc4f1ea06e78b5e27b30ec9b16 (diff) | |
| parent | c03571107213331494fb5330fd2bb4129d19cdbc (diff) | |
| download | nixlib-0135e61b4c59357e01e0fda713e95402ea3a443c.tar nixlib-0135e61b4c59357e01e0fda713e95402ea3a443c.tar.gz nixlib-0135e61b4c59357e01e0fda713e95402ea3a443c.tar.bz2 nixlib-0135e61b4c59357e01e0fda713e95402ea3a443c.tar.lz nixlib-0135e61b4c59357e01e0fda713e95402ea3a443c.tar.xz nixlib-0135e61b4c59357e01e0fda713e95402ea3a443c.tar.zst nixlib-0135e61b4c59357e01e0fda713e95402ea3a443c.zip | |
Merge remote-tracking branch 'upstream/master' into staging
That way the tarball job succeeds
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 0167e51f2fdd..5c03d83d5f7b 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -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; |