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

5 years ago · b438c6f8ea
parent bad9468ce1
commit b438c6f8ea
2 changed files with 5 additions and 3 deletions
--- 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;
 }
--- 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