diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2017-02-11 18:24:24 -0500 |
|---|---|---|
| committer | John Ericson <Ericson2314@Yahoo.com> | 2017-04-24 16:31:45 -0400 |
| commit | a7068ace35c5344fc2760733d32cca8fd4f01116 (patch) | |
| tree | 769ee153492039fa7dfeb5b758a63bced9740472 /pkgs/top-level/all-packages.nix | |
| parent | a7d89139ea74791137bfa606d109e515512c8460 (diff) | |
| download | nixlib-a7068ace35c5344fc2760733d32cca8fd4f01116.tar nixlib-a7068ace35c5344fc2760733d32cca8fd4f01116.tar.gz nixlib-a7068ace35c5344fc2760733d32cca8fd4f01116.tar.bz2 nixlib-a7068ace35c5344fc2760733d32cca8fd4f01116.tar.lz nixlib-a7068ace35c5344fc2760733d32cca8fd4f01116.tar.xz nixlib-a7068ace35c5344fc2760733d32cca8fd4f01116.tar.zst nixlib-a7068ace35c5344fc2760733d32cca8fd4f01116.zip | |
Rewrite a few `stdenv.cross` uses that *should* be `targetPlatform`
The previous commit redefines `stdenv.cross` for the sake of normal libaries, the most common use-case of that attribute. Some compilers however relied on the old definition so we have them use `targetPlatform` instead. This special casing is fine because we eventually want to remove `stdenv.cross` and use either `hostPlatform` or `targetPlatform` instead.
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91337d67bb4f..5da33b382446 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4971,8 +4971,8 @@ with pkgs; gccCrossStageStatic = assert targetPlatform != buildPlatform; let libcCross1 = - if stdenv.cross.libc == "msvcrt" then windows.mingw_w64_headers - else if stdenv.cross.libc == "libSystem" then darwin.xcode + if targetPlatform.libc == "msvcrt" then windows.mingw_w64_headers + else if targetPlatform.libc == "libSystem" then darwin.xcode else null; in wrapGCCCross { gcc = forcedNativePackages.gcc.cc.override { |