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

Merge staging-next-21.05 into staging-21.05

This commit is contained in:
github-actions[bot] 2021-09-18 00:03:24 +00:00 committed by GitHub
parent 4d34318507 7def88012f
commit 1b379960f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/build-support/cc-wrapper/default.nix
View File

@ -458,6 +458,9 @@ stdenv.mkDerivation {
+ optionalString (targetPlatform ? gcc.mode) '' + optionalString (targetPlatform ? gcc.mode) ''
echo "-mmode=${targetPlatform.gcc.mode}" >> $out/nix-support/cc-cflags-before echo "-mmode=${targetPlatform.gcc.mode}" >> $out/nix-support/cc-cflags-before
'' ''
+ optionalString (targetPlatform ? gcc.thumb) ''
echo "-m${if targetPlatform.gcc.thumb then "thumb" else "arm"}" >> $out/nix-support/cc-cflags-before
''
+ optionalString (targetPlatform ? gcc.tune && + optionalString (targetPlatform ? gcc.tune &&
isGccArchSupported targetPlatform.gcc.tune) '' isGccArchSupported targetPlatform.gcc.tune) ''
echo "-mtune=${targetPlatform.gcc.tune}" >> $out/nix-support/cc-cflags-before echo "-mtune=${targetPlatform.gcc.tune}" >> $out/nix-support/cc-cflags-before