Browse Source

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

master
Nick Brassel 2 years ago
committed by GitHub
parent
commit
b438c6f8ea
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      shell.nix
  2. 4
      tmk_core/avr.mk

4
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;
}

4
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

Loading…
Cancel
Save