diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-06-08 15:40:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-08 15:40:35 -0400 |
| commit | 2f348884b8bc8938d2a98f4960a81ab1a2377f7f (patch) | |
| tree | b440aba63d123a6187f7cf5144906d4f2e0f891f /pkgs/top-level | |
| parent | 3cb5d52dacba10121f7a20dbbd18a856f849a3a7 (diff) | |
| parent | 7a134572532323900a6661e5f1fea09b6dea3479 (diff) | |
| download | nixlib-2f348884b8bc8938d2a98f4960a81ab1a2377f7f.tar nixlib-2f348884b8bc8938d2a98f4960a81ab1a2377f7f.tar.gz nixlib-2f348884b8bc8938d2a98f4960a81ab1a2377f7f.tar.bz2 nixlib-2f348884b8bc8938d2a98f4960a81ab1a2377f7f.tar.lz nixlib-2f348884b8bc8938d2a98f4960a81ab1a2377f7f.tar.xz nixlib-2f348884b8bc8938d2a98f4960a81ab1a2377f7f.tar.zst nixlib-2f348884b8bc8938d2a98f4960a81ab1a2377f7f.zip | |
Merge pull request #26471 from obsidiansystems/gcc7-no-cross-arg
gcc 7: Remove `cross` arguments and don't use stdenv.is*
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f05fa6c42eb..4962e3fa4821 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5247,10 +5247,6 @@ with pkgs; # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); - # When building `gcc.crossDrv' (a "Canadian cross", with host == target - # and host != build), `cross' must be null but the cross-libc must still - # be passed. - cross = null; libcCross = if targetPlatform != buildPlatform then libcCross else null; isl = if !stdenv.isDarwin then isl_0_17 else null; |