public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

darwin/xcode: remove -arch flags

Browse Source 
These are now provided by the standard bintools and cc wrappers.
This commit is contained in:
Andrew Childs 2020-12-12 15:49:48 +09:00
parent b26e0bac8d
commit 8feb949ab5
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
View File

@ -14,12 +14,6 @@ let
minSdkVersion = targetPlatform.minSdkVersion or "9.0"; minSdkVersion = targetPlatform.minSdkVersion or "9.0";
iosPlatformArch = { parsed, ... }: {
armv7a = "armv7";
aarch64 = "arm64";
x86_64 = "x86_64";
}.${parsed.cpu.name};
in in
rec { rec {
@ -35,9 +29,7 @@ rec {
binutils = wrapBintoolsWith { binutils = wrapBintoolsWith {
libc = targetIosSdkPkgs.libraries; libc = targetIosSdkPkgs.libraries;
bintools = binutils-unwrapped; bintools = binutils-unwrapped;
extraBuildCommands = '' extraBuildCommands = lib.optionalString (sdk.platform == "iPhoneSimulator") ''
echo "-arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/libc-ldflags
'' + lib.optionalString (sdk.platform == "iPhoneSimulator") ''
echo "-platform_version ios-sim ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags echo "-platform_version ios-sim ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags
'' + lib.optionalString (sdk.platform == "iPhoneOS") '' '' + lib.optionalString (sdk.platform == "iPhoneOS") ''
echo "-platform_version ios ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags echo "-platform_version ios ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags
@ -52,7 +44,7 @@ rec {
extraBuildCommands = '' extraBuildCommands = ''
tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp
mv cc-cflags.tmp $out/nix-support/cc-cflags 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 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") '' '' + lib.optionalString (sdk.platform == "iPhoneSimulator") ''
echo "-mios-simulator-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags echo "-mios-simulator-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags