diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | scripts/standalone.mk | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -25,7 +25,7 @@ PROGRAM_ROOT ?= $(abspath .) SRC_DIR = $(PROGRAM_ROOT)/software/$(PROGRAM) -PROGRAM_ELF = $(SRC_DIR)/$(PROGRAM) +PROGRAM_ELF = $(SRC_DIR)/$(PROGRAM).elf PROGRAM_HEX = $(SRC_DIR)/$(PROGRAM).hex ############################################################# diff --git a/scripts/standalone.mk b/scripts/standalone.mk index 6fa3da4..ac5635f 100644 --- a/scripts/standalone.mk +++ b/scripts/standalone.mk @@ -112,7 +112,7 @@ include $(CONFIGURATION).mk # Software ############################################################# -PROGRAM_ELF ?= $(SRC_DIR)/$(PROGRAM) +PROGRAM_ELF ?= $(SRC_DIR)/$(PROGRAM).elf PROGRAM_HEX ?= $(SRC_DIR)/$(PROGRAM).hex .PHONY: all @@ -135,7 +135,7 @@ $(PROGRAM_ELF): \ $(BSP_DIR)/install/lib/libmetal.a \ $(BSP_DIR)/install/lib/libmetal-gloss.a \ $(BSP_DIR)/metal.lds - $(MAKE) -C $(dir $@) $(notdir $@) \ + $(MAKE) -C $(dir $@) $(basename $(notdir $@)) \ AR=$(RISCV_AR) \ CC=$(RISCV_GCC) \ CXX=$(RISCV_GXX) \ |