From 4769e0562688e808f8b94a1c0f02649e81237f08 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Wed, 16 Feb 2022 14:05:27 +0100 Subject: [PATCH] mk: abi does not depend shared-lib dependencies This patch cuts the superfluous dependency of abi.so files from the library dependencies of the corresponding lib.so file. ABIs depend only on symbol files. Prior this patch, the second step of the following sequence would wrongly re-build the abi.so file. arm_v6$ make init arm_v6$ make init KERNEL=hw As the KERNEL argument does not affect the ABI, the abi.so should better not be created twice. Issue #4408 --- repos/base/mk/lib.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/base/mk/lib.mk b/repos/base/mk/lib.mk index 0958e6626c..75317fb651 100644 --- a/repos/base/mk/lib.mk +++ b/repos/base/mk/lib.mk @@ -221,7 +221,7 @@ STATIC_LIBS_BRIEF := $(subst $(LIB_CACHE_DIR),$$libs,$(STATIC_LIBS)) # ENTRY_POINT ?= 0x0 -$(LIB_SO) $(ABI_SO): $(SHARED_LIBS) +$(LIB_SO): $(SHARED_LIBS) $(LIB_SO): $(STATIC_LIBS) $(OBJECTS) $(wildcard $(LD_SCRIPT_SO)) $(LIB_SO_DEPS) $(MSG_MERGE)$(LIB_SO)