From b73c5ddc7dbcc0c3505461058d91fc9bcd883ede Mon Sep 17 00:00:00 2001 From: Kedar Sovani Date: Thu, 3 Aug 2017 16:57:43 +0530 Subject: [PATCH] build: Print real paths for generated build objects --- make/component_wrapper.mk | 8 ++++---- make/project.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/make/component_wrapper.mk b/make/component_wrapper.mk index 77c679c815..63773b5fe3 100644 --- a/make/component_wrapper.mk +++ b/make/component_wrapper.mk @@ -164,7 +164,7 @@ build: $(COMPONENT_LIBRARY) # Build the archive. We remove the archive first, otherwise ar will get confused if we update # an archive when multiple filenames have the same name (src1/test.o and src2/test.o) $(COMPONENT_LIBRARY): $(COMPONENT_OBJS) $(COMPONENT_EMBED_OBJS) - $(summary) AR $@ + $(summary) AR $(patsubst $(PWD)/%,%,$(CURDIR))/$@ rm -f $@ $(AR) cru $@ $^ endif @@ -198,17 +198,17 @@ define GenerateCompileTargets # $(1) - directory containing source files, relative to $(COMPONENT_PATH) - one of $(COMPONENT_SRCDIRS) # $(1)/%.o: $$(COMPONENT_PATH)/$(1)/%.c $(COMMON_MAKEFILES) $(COMPONENT_MAKEFILE) | $(COMPONENT_SRCDIRS) - $$(summary) CC $$@ + $$(summary) CC $$(patsubst $$(PWD)/%,%,$$(CURDIR))/$$@ $$(CC) $$(CFLAGS) $$(CPPFLAGS) $$(addprefix -I ,$$(COMPONENT_INCLUDES)) $$(addprefix -I ,$$(COMPONENT_EXTRA_INCLUDES)) -I$(1) -c $$< -o $$@ $(call AppendSourceToDependencies,$$<,$$@) $(1)/%.o: $$(COMPONENT_PATH)/$(1)/%.cpp $(COMMON_MAKEFILES) $(COMPONENT_MAKEFILE) | $(COMPONENT_SRCDIRS) - $$(summary) CXX $$@ + $$(summary) CXX $$(patsubst $$(PWD)/%,%,$$(CURDIR))/$$@ $$(CXX) $$(CXXFLAGS) $$(CPPFLAGS) $$(addprefix -I,$$(COMPONENT_INCLUDES)) $$(addprefix -I,$$(COMPONENT_EXTRA_INCLUDES)) -I$(1) -c $$< -o $$@ $(call AppendSourceToDependencies,$$<,$$@) $(1)/%.o: $$(COMPONENT_PATH)/$(1)/%.S $(COMMON_MAKEFILES) $(COMPONENT_MAKEFILE) | $(COMPONENT_SRCDIRS) - $$(summary) AS $$@ + $$(summary) AS $$(patsubst $$(PWD)/%,%,$$(CURDIR))/$$@ $$(CC) $$(CPPFLAGS) $$(DEBUG_FLAGS) $$(addprefix -I ,$$(COMPONENT_INCLUDES)) $$(addprefix -I ,$$(COMPONENT_EXTRA_INCLUDES)) -I$(1) -c $$< -o $$@ $(call AppendSourceToDependencies,$$<,$$@) diff --git a/make/project.mk b/make/project.mk index f6c958f2f6..d2f3cfcd5a 100644 --- a/make/project.mk +++ b/make/project.mk @@ -326,7 +326,7 @@ endif # also depends on additional dependencies (linker scripts & binary libraries) # stored in COMPONENT_LINKER_DEPS, built via component.mk files' COMPONENT_ADD_LINKER_DEPS variable $(APP_ELF): $(foreach libcomp,$(COMPONENT_LIBRARIES),$(BUILD_DIR_BASE)/$(libcomp)/lib$(libcomp).a) $(COMPONENT_LINKER_DEPS) $(COMPONENT_PROJECT_VARS) - $(summary) LD $(notdir $@) + $(summary) LD $(patsubst $(PWD)/%,%,$@) $(CC) $(LDFLAGS) -o $@ -Wl,-Map=$(APP_MAP) app: $(APP_BIN)