diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-09-21 18:57:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-21 18:57:16 -0400 |
| commit | 56574e608706914f6b78557fc05e4705c7830945 (patch) | |
| tree | c386bd52536cc515e3f57dac796c05da4f68c968 /pkgs/os-specific | |
| parent | 677371c5316ca19e257691dd2d5068dc6f24f024 (diff) | |
| parent | b9bf90ca6c7d980c9ff34d67fb3950c47b6be6b8 (diff) | |
| download | nixpkgs-56574e608706914f6b78557fc05e4705c7830945.tar nixpkgs-56574e608706914f6b78557fc05e4705c7830945.tar.gz nixpkgs-56574e608706914f6b78557fc05e4705c7830945.tar.bz2 nixpkgs-56574e608706914f6b78557fc05e4705c7830945.tar.lz nixpkgs-56574e608706914f6b78557fc05e4705c7830945.tar.xz nixpkgs-56574e608706914f6b78557fc05e4705c7830945.tar.zst nixpkgs-56574e608706914f6b78557fc05e4705c7830945.zip | |
Merge pull request #29610 from obsidiansystems/no-gccCrossStageFinal
top-level: No `gccCrossStageFinal` needed anymore
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/gnu/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix index fb3796394e8..478040132b8 100644 --- a/pkgs/os-specific/gnu/default.nix +++ b/pkgs/os-specific/gnu/default.nix @@ -2,7 +2,7 @@ args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool , texinfo, glibcCross, hurdPartedCross, libuuid, samba -, gccCrossStageStatic, gccCrossStageFinal +, gccCrossStageStatic, gcc , forceSystem, newScope, platform, config , targetPlatform, buildPlatform , overrides ? {} @@ -28,7 +28,7 @@ let automake = automake111x; headersOnly = false; cross = assert targetPlatform != buildPlatform; targetPlatform; - gccCross = gccCrossStageFinal; + gccCross = gcc; }; hurdCrossIntermediate = forcedNativePackages.callPackage ./hurd { |