diff options
| author | Steven Pease <peasteven@gmail.com> | 2021-01-20 10:14:46 -0800 |
|---|---|---|
| committer | Steven Pease <peasteven@gmail.com> | 2021-01-20 10:14:46 -0800 |
| commit | b766673c6facbc4f8a26b0af41b1906f8d53370d (patch) | |
| tree | 3783944369ea0359c8c34aa8355265bdd1027271 /pkgs | |
| parent | 8f74a08fa01bcce890908833949ffffde32acbba (diff) | |
| download | nixpkgs-b766673c6facbc4f8a26b0af41b1906f8d53370d.tar nixpkgs-b766673c6facbc4f8a26b0af41b1906f8d53370d.tar.gz nixpkgs-b766673c6facbc4f8a26b0af41b1906f8d53370d.tar.bz2 nixpkgs-b766673c6facbc4f8a26b0af41b1906f8d53370d.tar.lz nixpkgs-b766673c6facbc4f8a26b0af41b1906f8d53370d.tar.xz nixpkgs-b766673c6facbc4f8a26b0af41b1906f8d53370d.tar.zst nixpkgs-b766673c6facbc4f8a26b0af41b1906f8d53370d.zip | |
Move disabling of gccForLibs for iOS to build-support cc-wrapper
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 0855c27eff4..d1d5f8e6c86 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -65,6 +65,7 @@ let && libcxx == null && !(stdenv.targetPlatform.useLLVM or false) && !(stdenv.targetPlatform.useAndroidPrebuilt or false) + && !(stdenv.targetPlatform.isiOS or false) && gccForLibs != null; # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98cbea8f7f6..644e5b46d22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11870,7 +11870,6 @@ in # Can only do this is in the native case, otherwise we might get infinite # recursion if `targetPackages.stdenv.cc.cc` itself uses `gccForLibs`. then targetPackages.stdenv.cc.cc - else if targetPlatform.isiOS then null else gcc.cc; libstdcxx5 = callPackage ../development/libraries/gcc/libstdc++/5.nix { }; |