aboutsummaryrefslogtreecommitdiffstats
path: root/tmk_core
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2020-03-07 03:05:51 +1100
committerGitHub <noreply@github.com>2020-03-07 03:05:51 +1100
commitb438c6f8eab1c1f940c3af3a3fdfc99b34fc3bf2 (patch)
tree7fc1d36950268174dd3011e2796933ceb2b9b4c2 /tmk_core
parentbad9468ce1b2700188e1bc30ddfd7f0f9ed435bd (diff)
downloadfirmware-b438c6f8eab1c1f940c3af3a3fdfc99b34fc3bf2.tar.gz
firmware-b438c6f8eab1c1f940c3af3a3fdfc99b34fc3bf2.tar.bz2
firmware-b438c6f8eab1c1f940c3af3a3fdfc99b34fc3bf2.zip
Fix up Arm builds with nix-shell. (#8312)
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/avr.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index d5ca3a4dd..1525391a4 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