diff options
author | Andrew Childs <lorne@cons.org.nz> | 2021-04-10 18:11:48 +0900 |
---|---|---|
committer | Andrew Childs <lorne@cons.org.nz> | 2021-04-11 09:47:10 +0900 |
commit | 33265e0dd9c485197e440192bef3f15e4f366af9 (patch) | |
tree | cfcc381254d887cbcee9bc969db938115310188d /pkgs/os-specific/darwin/xcode/sdk-pkgs.nix | |
parent | d0418480f1191167b0416dc3482c90ccd604d9bf (diff) | |
download | nixpkgs-33265e0dd9c485197e440192bef3f15e4f366af9.tar nixpkgs-33265e0dd9c485197e440192bef3f15e4f366af9.tar.gz nixpkgs-33265e0dd9c485197e440192bef3f15e4f366af9.tar.bz2 nixpkgs-33265e0dd9c485197e440192bef3f15e4f366af9.tar.lz nixpkgs-33265e0dd9c485197e440192bef3f15e4f366af9.tar.xz nixpkgs-33265e0dd9c485197e440192bef3f15e4f366af9.tar.zst nixpkgs-33265e0dd9c485197e440192bef3f15e4f366af9.zip |
darwin/xcode: remove platform version flags
These are now provided by the standard bintools and cc wrappers.
Diffstat (limited to 'pkgs/os-specific/darwin/xcode/sdk-pkgs.nix')
-rw-r--r-- | pkgs/os-specific/darwin/xcode/sdk-pkgs.nix | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index cabac19ba86..ab934d7eaaa 100644 --- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -29,11 +29,6 @@ rec { binutils = wrapBintoolsWith { libc = targetIosSdkPkgs.libraries; bintools = binutils-unwrapped; - 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 - ''; }; clang = (wrapCCWith { @@ -46,10 +41,6 @@ rec { mv cc-cflags.tmp $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 - '' + lib.optionalString (sdk.platform == "iPhoneOS") '' - echo "-miphoneos-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags ''; }) // { inherit sdk; |