diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-09-18 00:01:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-18 00:01:33 +0000 |
| commit | c4fd2a8f996798b28e181a8cc8f826ff6bb5e251 (patch) | |
| tree | 7881b90d43c8ec8b86f25878db87b8d218462052 /pkgs/build-support | |
| parent | bc51c5cae6b9275f90ee19655c8040e8d2e8f4de (diff) | |
| parent | a2645154932a3422ebec391436d3695daefedb5c (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 804f59286c7ac..3738f628b187b 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -463,6 +463,9 @@ stdenv.mkDerivation { + optionalString (targetPlatform ? gcc.mode) '' 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 && isGccArchSupported targetPlatform.gcc.tune) '' echo "-mtune=${targetPlatform.gcc.tune}" >> $out/nix-support/cc-cflags-before |