summaryrefslogtreecommitdiff
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
parentbad9468ce1b2700188e1bc30ddfd7f0f9ed435bd (diff)
Fix up Arm builds with nix-shell. (#8312)
-rw-r--r--shell.nix4
-rw-r--r--tmk_core/avr.mk4
2 files changed, 5 insertions, 3 deletions
diff --git a/shell.nix b/shell.nix
index d7c3b61744..8906bacfae 100644
--- a/shell.nix
+++ b/shell.nix
@@ -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