Fix up Arm builds with nix-shell. (qmk#8312)

zsa · May 24, 2020 · 1a1e25d · 1a1e25d
1 parent 4d704fb
commit 1a1e25d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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