Move disabling of gccForLibs for iOS to build-support cc-wrapper
commitb766673c6facbc4f8a26b0af41b1906f8d53370d
authorSteven Pease <peasteven@gmail.com>
dateWed 20 Jan 2021, 10:14 (6 years ago)
parent8f74a08
pkgs/build-support/cc-wrapper/default.nix+1
@@ -65,6 +65,7 @@ let
6565 && libcxx == null
6666 && !(stdenv.targetPlatform.useLLVM or false)
6767 && !(stdenv.targetPlatform.useAndroidPrebuilt or false)
68+ && !(stdenv.targetPlatform.isiOS or false)
6869 && gccForLibs != null;
6970
7071 # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu
pkgs/top-level/all-packages.nix−1
@@ -11870,7 +11870,6 @@ in
1187011870 # Can only do this is in the native case, otherwise we might get infinite
1187111871 # recursion if `targetPackages.stdenv.cc.cc` itself uses `gccForLibs`.
1187211872 then targetPackages.stdenv.cc.cc
11873− else if targetPlatform.isiOS then null
1187411873 else gcc.cc;
1187511874
1187611875 libstdcxx5 = callPackage ../development/libraries/gcc/libstdc++/5.nix { };