diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-16 06:00:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-16 06:00:56 +0000 |
| commit | 5fb2bcd3dd2f9f2f8db70bd1e7befefc08902830 (patch) | |
| tree | 7f3fee1fc3796e2b3690980d0e07a6ab60a6eb2d /pkgs/build-support/cc-wrapper | |
| parent | 7006358e6adeb5d3f31425beb35309b73bc8c80d (diff) | |
| parent | b484a25daf1808ce3ac3e2d007870f6ef25f5fcf (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 49bd90794a941..23b3ce522ae38 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -688,6 +688,12 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" stackprotector" '' + + optionalString (libc != null && targetPlatform.isAvr) '' + for isa in avr5 avr3 avr4 avr6 avr25 avr31 avr35 avr51 avrxmega2 avrxmega4 avrxmega5 avrxmega6 avrxmega7 tiny-stack; do + echo "-B${getLib libc}/avr/lib/$isa" >> $out/nix-support/libc-crt1-cflags + done + '' + + optionalString stdenv.targetPlatform.isDarwin '' echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags '' |