Browse Source

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

master
Nick Brassel 1 year ago
committed by GitHub
parent
commit
b438c6f8ea
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
  1. +2
    -2
      shell.nix
  2. +3
    -1
      tmk_core/avr.mk

+ 2
- 2
shell.nix View File

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

+ 3
- 1
tmk_core/avr.mk View File

@ -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