Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

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

Browse source
This commit is contained in:
Nick Brassel 2020-03-07 03:05:51 +11:00 • committed by GitHub
commit b438c6f8ea
Failed to generate hash of commit
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shell.nix
View file

@ -45,6 +45,6 @@ stdenv.mkDerivation {
++ lib.optional arm [ gcc-arm-embedded ] ++ lib.optional arm [ gcc-arm-embedded ]
++ lib.optional teensy [ teensy-loader-cli ]; ++ lib.optional teensy [ teensy-loader-cli ];
CFLAGS = lib.optional avr avr_incflags; AVR_CFLAGS = lib.optional avr avr_incflags;
ASFLAGS = lib.optional avr avr_incflags; AVR_ASFLAGS = lib.optional avr avr_incflags;
} }

4
tmk_core/avr.mk
View file

@ -21,7 +21,9 @@ COMPILEFLAGS += -fdata-sections
COMPILEFLAGS += -fpack-struct COMPILEFLAGS += -fpack-struct
COMPILEFLAGS += -fshort-enums COMPILEFLAGS += -fshort-enums
CFLAGS += $(COMPILEFLAGS) ASFLAGS += $(AVR_ASFLAGS)
CFLAGS += $(COMPILEFLAGS) $(AVR_CFLAGS)
CFLAGS += -fno-inline-small-functions CFLAGS += -fno-inline-small-functions
CFLAGS += -fno-strict-aliasing CFLAGS += -fno-strict-aliasing