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

Merge pull request #110101 from spease/fix-ios-patches

Browse Source 
Minimalist iOS fixes
This commit is contained in:
John Ericson 2021-01-20 14:41:13 -05:00 committed by GitHub
commit bfc062e4cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 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

@ -11626,6 +11626,7 @@ in
bingrep = callPackage ../development/tools/analysis/bingrep { }; bingrep = callPackage ../development/tools/analysis/bingrep { };
binutils-unwrapped = callPackage ../development/tools/misc/binutils { binutils-unwrapped = callPackage ../development/tools/misc/binutils {
autoreconfHook = if targetPlatform.isiOS then autoreconfHook269 else autoreconfHook;
# FHS sys dirs presumably only have stuff for the build platform # FHS sys dirs presumably only have stuff for the build platform
noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs;
}; };