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

tzarc · web-flow · commit b438c6f8eab1 · 2020-03-07T03:05:51.000+11:00
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
 

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,6 @@ stdenv.mkDerivation {`
`45`	`45`	`++ lib.optional arm [ gcc-arm-embedded ]`
`46`	`46`	`++ lib.optional teensy [ teensy-loader-cli ];`
`47`	`47`
`48`		`- CFLAGS = lib.optional avr avr_incflags;`
`49`		`- ASFLAGS = lib.optional avr avr_incflags;`
	`48`	`+ AVR_CFLAGS = lib.optional avr avr_incflags;`
	`49`	`+ AVR_ASFLAGS = lib.optional avr avr_incflags;`
`50`	`50`	`}`