From 5734ea736c024252290b6aeaa37cfd513645a649 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Fri, 1 Dec 2023 09:40:00 +0100 Subject: [PATCH] mk: remove unused LIB_SO_DEPS variable Spotted during our work on issue #5061. --- repos/base/mk/abi.mk | 5 +---- repos/base/mk/prg.mk | 2 +- repos/base/mk/so.mk | 13 +------------ 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/repos/base/mk/abi.mk b/repos/base/mk/abi.mk index 4c80b3829c..0bcdeeb6b2 100644 --- a/repos/base/mk/abi.mk +++ b/repos/base/mk/abi.mk @@ -92,7 +92,4 @@ all: # prevent 'Nothing to be done' message $(ABI_SO): symbols.o $(MSG_MERGE)$(ABI_SO) $(VERBOSE)$(LD) -o $(ABI_SO) -soname=$(ABI_SONAME) -shared --eh-frame-hdr $(LD_OPT) \ - -T $(LD_SCRIPT_SO) \ - --whole-archive --start-group \ - $(LIB_SO_DEPS) $< \ - --end-group --no-whole-archive + -T $(LD_SCRIPT_SO) $< diff --git a/repos/base/mk/prg.mk b/repos/base/mk/prg.mk index 0755b418f8..73ff33b300 100644 --- a/repos/base/mk/prg.mk +++ b/repos/base/mk/prg.mk @@ -209,7 +209,7 @@ endif # $(TARGET). # ifneq ($(OBJECTS),) -$(TARGET): $(LINK_ITEMS) $(wildcard $(LD_SCRIPTS)) $(LIB_SO_DEPS) +$(TARGET): $(LINK_ITEMS) $(wildcard $(LD_SCRIPTS)) $(MSG_LINK)$(TARGET) $(VERBOSE)libs=$(LIB_CACHE_DIR); $(LD_CMD) -o $@ diff --git a/repos/base/mk/so.mk b/repos/base/mk/so.mk index d9b5f42eb2..3cab900abd 100644 --- a/repos/base/mk/so.mk +++ b/repos/base/mk/so.mk @@ -144,22 +144,11 @@ endif STATIC_LIBS := $(sort $(foreach l,$(ARCHIVES:.lib.a=),$(LIB_CACHE_DIR)/$l/$l.lib.a)) STATIC_LIBS_BRIEF := $(subst $(LIB_CACHE_DIR),$$libs,$(STATIC_LIBS)) -# -# Rule to build the .lib.so file -# -# When linking the shared library, we have to link all shared sub libraries -# (LIB_SO_DEPS) to the library to store the library-dependency information in -# the generated shared object. -# - -# -# Default entry point of shared libraries -# ENTRY_POINT ?= 0x0 $(LIB_SO): $(SHARED_LIBS) -$(LIB_SO): $(STATIC_LIBS) $(OBJECTS) $(wildcard $(LD_SCRIPT_SO)) $(LIB_SO_DEPS) +$(LIB_SO): $(STATIC_LIBS) $(OBJECTS) $(wildcard $(LD_SCRIPT_SO)) $(MSG_MERGE)$(LIB_SO) $(VERBOSE)libs=$(LIB_CACHE_DIR); $(LD) -o $(LIB_SO) -soname=$(LIB_SO) -shared --eh-frame-hdr \ $(LD_OPT) -T $(LD_SCRIPT_SO) --entry=$(ENTRY_POINT) \