diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2020-12-12 15:49:48 +0900 |
|---|---|---|
| committer | Andrew Childs <lorne@cons.org.nz> | 2021-03-02 17:22:06 +0900 |
| commit | 8feb949ab540130063d1c57db7244024887c4ed9 (patch) | |
| tree | 68a4d48b5d9a96f61432e5bdad8ed72fc374cb5a /pkgs/os-specific/darwin | |
| parent | b26e0bac8dab068e54b0c8ee1bf8fd5fe5683b39 (diff) | |
| download | nixpkgs-8feb949ab540130063d1c57db7244024887c4ed9.tar nixpkgs-8feb949ab540130063d1c57db7244024887c4ed9.tar.gz nixpkgs-8feb949ab540130063d1c57db7244024887c4ed9.tar.bz2 nixpkgs-8feb949ab540130063d1c57db7244024887c4ed9.tar.lz nixpkgs-8feb949ab540130063d1c57db7244024887c4ed9.tar.xz nixpkgs-8feb949ab540130063d1c57db7244024887c4ed9.tar.zst nixpkgs-8feb949ab540130063d1c57db7244024887c4ed9.zip | |
darwin/xcode: remove -arch flags
These are now provided by the standard bintools and cc wrappers.
Diffstat (limited to 'pkgs/os-specific/darwin')
| -rw-r--r-- | pkgs/os-specific/darwin/xcode/sdk-pkgs.nix | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index 16ed52ea81e..cabac19ba86 100644 --- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -14,12 +14,6 @@ let minSdkVersion = targetPlatform.minSdkVersion or "9.0"; -iosPlatformArch = { parsed, ... }: { - armv7a = "armv7"; - aarch64 = "arm64"; - x86_64 = "x86_64"; -}.${parsed.cpu.name}; - in rec { @@ -35,9 +29,7 @@ rec { binutils = wrapBintoolsWith { libc = targetIosSdkPkgs.libraries; bintools = binutils-unwrapped; - extraBuildCommands = '' - echo "-arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/libc-ldflags - '' + lib.optionalString (sdk.platform == "iPhoneSimulator") '' + extraBuildCommands = lib.optionalString (sdk.platform == "iPhoneSimulator") '' echo "-platform_version ios-sim ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags '' + lib.optionalString (sdk.platform == "iPhoneOS") '' echo "-platform_version ios ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags @@ -52,7 +44,7 @@ rec { extraBuildCommands = '' tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp mv cc-cflags.tmp $out/nix-support/cc-cflags - echo "-target ${targetPlatform.config} -arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/cc-cflags + echo "-target ${targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-isystem ${sdk}/usr/include${lib.optionalString (lib.versionAtLeast "10" sdk.version) " -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++"}" >> $out/nix-support/cc-cflags '' + lib.optionalString (sdk.platform == "iPhoneSimulator") '' echo "-mios-simulator-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags |