diff --git a/repos/base/mk/dep_lib.mk b/repos/base/mk/dep_lib.mk index 21fcb77e58..91970ac00b 100644 --- a/repos/base/mk/dep_lib.mk +++ b/repos/base/mk/dep_lib.mk @@ -39,6 +39,7 @@ endif append_lib_to_progress_log: @echo "LIBS_READY += $(LIB)" >> $(LIB_PROGRESS_LOG) + LIB_MK_DIRS = $(foreach REP,$(REPOSITORIES),$(addprefix $(REP)/lib/mk/spec/, $(SPECS)) $(REP)/lib/mk) SYMBOLS_DIRS = $(foreach REP,$(REPOSITORIES),$(addprefix $(REP)/lib/symbols/spec/,$(SPECS)) $(REP)/lib/symbols) @@ -82,8 +83,14 @@ include $(LIB_MK) ifdef SHARED_LIB LIBS += ldso_so_support + +# record creation of shared library build artifact +append_artifact_to_progress_log: + @echo -e "\n# Build artifact $(LIB).lib.so\n" >> $(LIB_PROGRESS_LOG) +append_lib_to_progress_log: append_artifact_to_progress_log endif + # # Hide archive dependencies of shared libraries from users of the shared # library. Library users examine the 'DEP_A_' variable to determine diff --git a/repos/base/mk/dep_prg.mk b/repos/base/mk/dep_prg.mk index 190dd92aa1..6901266f6a 100644 --- a/repos/base/mk/dep_prg.mk +++ b/repos/base/mk/dep_prg.mk @@ -40,6 +40,11 @@ include $(foreach LIB,$(LIBS),$(call select_from_repositories,lib/import/import- # include $(SPEC_FILES) +# +# Names of build artifacts to appear in the 'progress.log' +# +BUILD_ARTIFACTS ?= $(TARGET) + # # Determine location of $(TARGET_MK) within 'src/', remove trailing slash # @@ -63,7 +68,7 @@ LIBS_TO_VISIT = $(filter-out $(LIBS_READY),$(LIBS)) # # Generate program rule # -gen_prg_rule: +gen_prg_rule: append_artifact_to_progress_log ifneq ($(LIBS),) @for i in $(LIBS_TO_VISIT); do \ $(MAKE) $(VERBOSE_DIR) -f $(BASE_DIR)/mk/dep_lib.mk REP_DIR=$(REP_DIR) LIB=$$i; done @@ -111,3 +116,8 @@ ifeq ($(FORCE_BUILD_LIBS),yes) @(echo ""; \ echo "all: \$$(addsuffix .lib,\$$(filter-out \$$(INVALID_DEPS), $(LIBS)))") >> $(LIB_DEP_FILE) endif + +append_artifact_to_progress_log: + @( $(foreach A,$(BUILD_ARTIFACTS),\ + echo -e "\n# Build artifact $A\n";) true \ + ) >> $(LIB_PROGRESS_LOG)