From b438c6f8eab1c1f940c3af3a3fdfc99b34fc3bf2 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sat, 7 Mar 2020 03:05:51 +1100
Subject: [PATCH] Fix up Arm builds with nix-shell. (#8312)

---
 shell.nix       | 4 ++--
 tmk_core/avr.mk | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/shell.nix b/shell.nix
index d7c3b617443..8906bacfae9 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 d5ca3a4dd8e..1525391a45d 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