diff options
| author | Nick Brassel <nick@tzarc.org> | 2020-03-07 03:05:51 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-07 03:05:51 +1100 |
| commit | b438c6f8eab1c1f940c3af3a3fdfc99b34fc3bf2 (patch) | |
| tree | 7fc1d36950268174dd3011e2796933ceb2b9b4c2 | |
| parent | bad9468ce1b2700188e1bc30ddfd7f0f9ed435bd (diff) | |
Fix up Arm builds with nix-shell. (#8312)0.8.17
| -rw-r--r-- | shell.nix | 4 | ||||
| -rw-r--r-- | tmk_core/avr.mk | 4 |
2 files changed, 5 insertions, 3 deletions
@@ -45,6 +45,6 @@ stdenv.mkDerivation { ++ lib.optional arm [ gcc-arm-embedded ] ++ lib.optional teensy [ teensy-loader-cli ]; - CFLAGS = lib.optional avr avr_incflags; - ASFLAGS = lib.optional avr avr_incflags; + AVR_CFLAGS = lib.optional avr avr_incflags; + AVR_ASFLAGS = lib.optional avr avr_incflags; } diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index d5ca3a4dd8..1525391a45 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk @@ -21,7 +21,9 @@ COMPILEFLAGS += -fdata-sections COMPILEFLAGS += -fpack-struct COMPILEFLAGS += -fshort-enums -CFLAGS += $(COMPILEFLAGS) +ASFLAGS += $(AVR_ASFLAGS) + +CFLAGS += $(COMPILEFLAGS) $(AVR_CFLAGS) CFLAGS += -fno-inline-small-functions CFLAGS += -fno-strict-aliasing |