diff options
| author | a-n-n-a-l-e-e <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2024-03-16 19:18:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-16 19:18:41 -0700 |
| commit | 8c421f78b27571be1ddc0b137797813a8b210b16 (patch) | |
| tree | 0f1c578f2d791ac008e1fcce257868ce3e19669f /pkgs/build-support/cc-wrapper | |
| parent | c0d81157f02912eee9dab03a3aacb8b1fe53fa64 (diff) | |
| parent | 8a7841ceef0a7c7794174178de786ae76cc27457 (diff) | |
Merge pull request #296082 from a-n-n-a-l-e-e/dont-pass-march-swift
swift: don't pass -march to swiftc
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 4e427bedc6536..b47ee454da030 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -53,6 +53,10 @@ , gccForLibs ? if useCcForLibs then cc else null , fortify-headers ? null , includeFortifyHeaders ? null + +# https://github.com/NixOS/nixpkgs/issues/295322 +# should -march flag be used +, disableMarch ? false }: with lib; @@ -609,7 +613,7 @@ stdenv.mkDerivation { # TODO: aarch64-darwin has mcpu incompatible with gcc + optionalString ((targetPlatform ? gcc.arch) && !isClang && !(stdenv.isDarwin && stdenv.isAarch64) && - isGccArchSupported targetPlatform.gcc.arch) '' + isGccArchSupported targetPlatform.gcc.arch && !disableMarch) '' echo "-march=${targetPlatform.gcc.arch}" >> $out/nix-support/cc-cflags-before '' @@ -705,7 +709,7 @@ stdenv.mkDerivation { + optionalString isClang '' # Escape twice: once for this script, once for the one it gets substituted into. export march=${lib.escapeShellArg - (lib.optionalString (targetPlatform ? gcc.arch) + (lib.optionalString (targetPlatform ? gcc.arch && !disableMarch) (lib.escapeShellArg "-march=${targetPlatform.gcc.arch}"))} export defaultTarget=${targetPlatform.config} substituteAll ${./add-clang-cc-cflags-before.sh} $out/nix-support/add-local-cc-cflags-before.sh |