diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-05-11 12:12:04 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-05-11 12:12:04 +0200 |
| commit | 8eabe2ecc57259810eb36ad34549c2cded8a4e86 (patch) | |
| tree | 08e7ce0fa39a70d16719bdbb721aa562613eda94 /pkgs/build-support/cc-wrapper | |
| parent | 79762fcb4a536f947394bacd4de81acdf3707f38 (diff) | |
| parent | 4aa95e33121c316c5b34031bb08106d2dc113e38 (diff) | |
| download | nixpkgs-8eabe2ecc57259810eb36ad34549c2cded8a4e86.tar nixpkgs-8eabe2ecc57259810eb36ad34549c2cded8a4e86.tar.gz nixpkgs-8eabe2ecc57259810eb36ad34549c2cded8a4e86.tar.bz2 nixpkgs-8eabe2ecc57259810eb36ad34549c2cded8a4e86.tar.lz nixpkgs-8eabe2ecc57259810eb36ad34549c2cded8a4e86.tar.xz nixpkgs-8eabe2ecc57259810eb36ad34549c2cded8a4e86.tar.zst nixpkgs-8eabe2ecc57259810eb36ad34549c2cded8a4e86.zip | |
Merge #115235: gcc: native aarch64-darwin support
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 36a98a180b3..10085b91a13 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -432,14 +432,16 @@ stdenv.mkDerivation { # Always add -march based on cpu in triple. Sometimes there is a # discrepency (x86_64 vs. x86-64), so we provide an "arch" arg in # that case. - + optionalString ((targetPlatform ? gcc.arch) && + # TODO: aarch64-darwin has mcpu incompatible with gcc + + optionalString ((targetPlatform ? gcc.arch) && (isClang || !(stdenv.isDarwin && stdenv.isAarch64)) && isGccArchSupported targetPlatform.gcc.arch) '' echo "-march=${targetPlatform.gcc.arch}" >> $out/nix-support/cc-cflags-before '' # -mcpu is not very useful. You should use mtune and march # instead. It’s provided here for backwards compatibility. - + optionalString (targetPlatform ? gcc.cpu) '' + # TODO: aarch64-darwin has mcpu incompatible with gcc + + optionalString ((targetPlatform ? gcc.cpu) && (isClang || !(stdenv.isDarwin && stdenv.isAarch64))) '' echo "-mcpu=${targetPlatform.gcc.cpu}" >> $out/nix-support/cc-cflags-before '' |