summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2013-04-10 23:35:35 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2013-04-11 16:44:24 +0200
commit2b4d8ab67bb5747d05c556663ff3d8aa470c3274 (patch)
tree82fb44ae50783a773aa9c9e09b8c448dcf8945b2
parentd11cad2a76f9ac5e914dcc53808cee4990c2dbf4 (diff)
do not install merged libraries
Since scp2 / make_installer ignores undefined ids, we can just filter-out merged autoinstalled libraries and we are done :-) Change-Id: I5ab63604d54a5a36caccf003a20112e2b47b79da
-rw-r--r--solenv/gbuild/Helper.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 64876e4bebac..f5f205bb65f2 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -183,7 +183,7 @@ $$(eval $$(call gb_Output_error,$(2) is not a valid install module for libraries
endif
$(call gb_Helper_register_libraries,$(1),$(3))
-gb_Library_MODULE_$(2) += $(3)
+gb_Library_MODULE_$(2) += $(filter-out $(gb_MERGEDLIBS) $(gb_URELIBS),$(3))
endef