Merge pull request #110101 from spease/fix-ios-patches
Minimalist iOS fixes
commitbfc062e4cf4d5be34ad3a26a8f0dd031523230c2
authorJohn Ericson <git@JohnEricson.me>
dateWed 20 Jan 2021, 14:41 (6 years ago)
parent610f0ebb766673
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
@@ -11626,6 +11626,7 @@ in
1162611626 bingrep = callPackage ../development/tools/analysis/bingrep { };
1162711627
1162811628 binutils-unwrapped = callPackage ../development/tools/misc/binutils {
11629+ autoreconfHook = if targetPlatform.isiOS then autoreconfHook269 else autoreconfHook;
1162911630 # FHS sys dirs presumably only have stuff for the build platform
1163011631 noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs;
1163111632 };