From 8f74a08fa01bcce890908833949ffffde32acbba Mon Sep 17 00:00:00 2001 From: Steven Pease Date: Tue, 19 Jan 2021 23:44:50 -0800 Subject: [PATCH 1/2] Minimalist iOS fixes --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c065ec325f7..98cbea8f7f65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11624,6 +11624,7 @@ in bingrep = callPackage ../development/tools/analysis/bingrep { }; 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 noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; }; @@ -11869,6 +11870,7 @@ 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 { }; From b766673c6facbc4f8a26b0af41b1906f8d53370d Mon Sep 17 00:00:00 2001 From: Steven Pease Date: Wed, 20 Jan 2021 10:14:46 -0800 Subject: [PATCH 2/2] Move disabling of gccForLibs for iOS to build-support cc-wrapper --- pkgs/build-support/cc-wrapper/default.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 0855c27eff49..d1d5f8e6c862 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 98cbea8f7f65..644e5b46d220 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 { };