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

Merge #115235: gcc: native aarch64-darwin support

Browse Source
This commit is contained in:
Vladimír Čunát
2021-05-11 12:12:04 +02:00
parent 79762fcb4a 4aa95e3312
commit 8eabe2ecc5
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/cc-wrapper/default.nix
+4 -2
View File
@@ -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
''