From 66773caefb25ea9cd05a0a6b552727292cf5d9a9 Mon Sep 17 00:00:00 2001 From: Devan Lai Date: Sat, 11 Mar 2023 09:41:40 -0800 Subject: [PATCH] Align PREFIX usage with locm3 Existing uses of PREFIX should now manually append the final hyphen --- src/Makefile | 2 +- src/rules.mk | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Makefile b/src/Makefile index c33d4e8..c216f4b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -50,7 +50,7 @@ dfuse-flash: $(BINARY).dfuse-flash dfu-flash: $(BINARY).dfu-flash size: $(OBJS) $(BINARY).elf - @$(PREFIX)-size $(OBJS) $(BINARY).elf + @$(PREFIX)size $(OBJS) $(BINARY).elf debug: $(BINARY).elf -$(GDB) --tui --eval "target remote | $(OOCD) -f $(OOCD_INTERFACE) -f $(OOCD_BOARD) -f ../openocd/debug.cfg" $(BINARY).elf diff --git a/src/rules.mk b/src/rules.mk index fda45db..e4466ca 100644 --- a/src/rules.mk +++ b/src/rules.mk @@ -73,16 +73,16 @@ OOCD_BOARD ?= target/stm32f0x.cfg #################################################################### # Executables -PREFIX ?= arm-none-eabi - -CC := $(PREFIX)-gcc -CXX := $(PREFIX)-g++ -LD := $(PREFIX)-gcc -AR := $(PREFIX)-ar -AS := $(PREFIX)-as -OBJCOPY := $(PREFIX)-objcopy -OBJDUMP := $(PREFIX)-objdump -GDB := $(PREFIX)-gdb +PREFIX ?= arm-none-eabi- + +CC := $(PREFIX)gcc +CXX := $(PREFIX)g++ +LD := $(PREFIX)gcc +AR := $(PREFIX)ar +AS := $(PREFIX)as +OBJCOPY := $(PREFIX)objcopy +OBJDUMP := $(PREFIX)objdump +GDB := $(PREFIX)gdb STFLASH = $(shell which st-flash) ####################################################################