summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2013-03-26 16:22:38 -0400
committerPeter Foley <pefoley2@verizon.net>2013-03-28 09:58:01 -0400
commit2cd5d5b12dab9042f78db74909bce9255fd93e31 (patch)
tree8b1ce915acaf5900721de01567375b27c9ad2343 /solenv
parent91c1161dd9e1fc73c91608f1320197daadd5ea2e (diff)
collapse merged libs in module-deps.pl
Change-Id: Id22ff49b1c1910e608c1968eee7bf9be97d46750
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/LinkTarget.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 52d268441892..cd3f39b2a20f 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -832,8 +832,11 @@ gb_LINKED_LIBS := $(if $(filter $(gb_MERGEDLIBS),$(2)), \
# used by bin/module-deps.pl
ifneq ($(ENABLE_PRINT_DEPS),)
+# exclude libraries in Library_merged
+ifeq ($(filter $(1),$(foreach lib,$(gb_MERGEDLIBS),$(call gb_Library_get_linktargetname,$(lib)))),)
$$(eval $$(call gb_PrintDeps_info,$(1),$$(gb_LINKED_LIBS),$(3),$(4)))
endif
+endif
$(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS += $$(gb_LINKED_LIBS)