From 71a2eb7b8539b8616fc587bd7e34b746be02ce67 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Wed, 17 Feb 2016 15:47:40 +1100 Subject: [PATCH] common.mk: Fix places using build/ instead of configurable BUILD_DIR --- common.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common.mk b/common.mk index 707fbf0..e565873 100644 --- a/common.mk +++ b/common.mk @@ -109,7 +109,7 @@ CXXFLAGS ?= $(C_CXX_FLAGS) -fno-exceptions -fno-rtti $(EXTRA_CXXFLAGS) # these aren't technically preprocesor args, but used by all 3 of C, C++, assembler CPPFLAGS += -mlongcalls -mtext-section-literals -LDFLAGS = -nostdlib -Wl,--no-check-sections -L$(BUILD_DIR)sdklib -L$(ROOT)lib -u $(ENTRY_SYMBOL) -Wl,-static -Wl,-Map=build/${PROGRAM}.map $(EXTRA_LDFLAGS) +LDFLAGS = -nostdlib -Wl,--no-check-sections -L$(BUILD_DIR)sdklib -L$(ROOT)lib -u $(ENTRY_SYMBOL) -Wl,-static -Wl,-Map=$(BUILD_DIR)$(PROGRAM).map $(EXTRA_LDFLAGS) ifeq ($(SPLIT_SECTIONS),1) C_CXX_FLAGS += -ffunction-sections -fdata-sections @@ -293,7 +293,7 @@ endef # - prefix all defined symbols with 'sdk_' # - weaken all global symbols so they can be overriden from the open SDK side # -# SDK binary libraries are preprocessed into build/sdklib +# SDK binary libraries are preprocessed into $(BUILD_DIR)/sdklib SDK_PROCESSED_LIBS = $(addsuffix .a,$(addprefix $(BUILD_DIR)sdklib/lib,$(SDK_LIBS))) # Make rules for preprocessing each SDK library