Fix broken builds when OBJDIR is specified in the BUILD build system module.

pull/1469/head
Dean Camera 12 years ago
parent 73a87a8c7b
commit fafb52118d

@ -145,7 +145,7 @@ endif
# Convert input source filenames into a list of required output object files # Convert input source filenames into a list of required output object files
OBJECT_FILES += $(addsuffix .o, $(basename $(SRC))) OBJECT_FILES += $(addsuffix .o, $(basename $(SRC)))
ifneq ($(OBJDIR),.) ifneq ($(OBJDIR),.)
$(shell mkdir $(OBJDIR) 2>&1 > /dev/null) $(shell mkdir $(OBJDIR) 2> /dev/null)
VPATH += $(dir $(SRC)) VPATH += $(dir $(SRC))
OBJECT_FILES := $(addprefix $(patsubst %/,%,$(OBJDIR))/, $(notdir $(OBJECT_FILES))) OBJECT_FILES := $(addprefix $(patsubst %/,%,$(OBJDIR))/, $(notdir $(OBJECT_FILES)))
endif endif
@ -228,7 +228,7 @@ clean: mostlyclean
all: build_begin check-source gcc-version elf hex lss sym size build_end all: build_begin check-source gcc-version elf hex lss sym size build_end
lib: $(TARGET).a lib: lib$(TARGET).a
elf: $(TARGET).elf elf: $(TARGET).elf
hex: $(TARGET).hex $(TARGET).eep hex: $(TARGET).hex $(TARGET).eep
lss: $(TARGET).lss lss: $(TARGET).lss

Loading…
Cancel
Save