diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2021-03-05 17:34:46 +0900 |
|---|---|---|
| committer | Andrew Childs <lorne@cons.org.nz> | 2021-04-11 09:47:10 +0900 |
| commit | 8b59d52ca3b6157f4cac333e6576c76f1fa546e8 (patch) | |
| tree | bcc3d5c4543fa68cc905d95e68211bb718a8fb40 /pkgs/build-support/cc-wrapper | |
| parent | 362cb82b75394680990cbe89f40fe65d35f66617 (diff) | |
| download | nixpkgs-8b59d52ca3b6157f4cac333e6576c76f1fa546e8.tar nixpkgs-8b59d52ca3b6157f4cac333e6576c76f1fa546e8.tar.gz nixpkgs-8b59d52ca3b6157f4cac333e6576c76f1fa546e8.tar.bz2 nixpkgs-8b59d52ca3b6157f4cac333e6576c76f1fa546e8.tar.lz nixpkgs-8b59d52ca3b6157f4cac333e6576c76f1fa546e8.tar.xz nixpkgs-8b59d52ca3b6157f4cac333e6576c76f1fa546e8.tar.zst nixpkgs-8b59d52ca3b6157f4cac333e6576c76f1fa546e8.zip | |
cc-wrapper: use legacy -mmacosx-version-min for gcc
See https://github.com/NixOS/nixpkgs/pull/105026#discussion_r587169144
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 91d83424901..3d2a142c36d 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -485,10 +485,15 @@ stdenv.mkDerivation { substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash '' - + optionalString stdenv.targetPlatform.isDarwin '' - echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags - echo "-m${targetPlatform.darwinPlatform}-version-min=${targetPlatform.darwinMinVersion}" >> $out/nix-support/cc-cflags-before - '' + + optionalString stdenv.targetPlatform.isDarwin ( + let darwinPlatformForCC = + if (targetPlatform.darwinPlatform == "macos" && isGNU) then "macosx" + else targetPlatform.darwinPlatform; + in '' + echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags + echo "-m${darwinPlatformForCC}-version-min=${targetPlatform.darwinMinVersion}" >> $out/nix-support/cc-cflags-before + '' + ) ## ## Extra custom steps |