dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Move disabling of gccForLibs for iOS to build-support cc-wrapper

Browse Source
This commit is contained in:
Steven Pease 2021-01-20 10:14:46 -08:00
parent 8f74a08fa0
commit b766673c6f
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/build-support/cc-wrapper/default.nix
View File

@ -65,6 +65,7 @@ let
&& libcxx == null && libcxx == null
&& !(stdenv.targetPlatform.useLLVM or false) && !(stdenv.targetPlatform.useLLVM or false)
&& !(stdenv.targetPlatform.useAndroidPrebuilt or false) && !(stdenv.targetPlatform.useAndroidPrebuilt or false)
&& !(stdenv.targetPlatform.isiOS or false)
&& gccForLibs != null; && gccForLibs != null;
# older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu

1
pkgs/top-level/all-packages.nix
View File

@ -11870,7 +11870,6 @@ in
# Can only do this is in the native case, otherwise we might get infinite # Can only do this is in the native case, otherwise we might get infinite
# recursion if `targetPackages.stdenv.cc.cc` itself uses `gccForLibs`. # recursion if `targetPackages.stdenv.cc.cc` itself uses `gccForLibs`.
then targetPackages.stdenv.cc.cc then targetPackages.stdenv.cc.cc
else if targetPlatform.isiOS then null
else gcc.cc; else gcc.cc;
libstdcxx5 = callPackage ../development/libraries/gcc/libstdc++/5.nix { }; libstdcxx5 = callPackage ../development/libraries/gcc/libstdc++/5.nix { };