diff options
| author | Nick Brassel <nick@tzarc.org> | 2020-03-07 03:05:51 +1100 |
|---|---|---|
| committer | Florian Didron <fdidron@users.noreply.github.com> | 2020-06-12 17:00:27 +0900 |
| commit | 8eec4424d095ca26ff874b4c5fd3ce915118fb57 (patch) | |
| tree | bcc8fb7808014f8f42b1157d8b898508927e3ed8 | |
| parent | ead0015d9a8ebea5e764c2064682978668dfa472 (diff) | |
Fix up Arm builds with nix-shell. (#8312)
| -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 82849e1a6a..19fd05c56f 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 |