summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2015-04-20 19:23:02 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-04-21 10:28:01 +0000
commit59cea45ec247df1acb691308c940ff97673e4c48 (patch)
tree3c187a5f989674f678933d0d8bb39f9c3e1d42df
parentd34f5fe5ef39de6ddeb10617f27a990c27883361 (diff)
Do not filter out libsax from installation even if it's merged
expwrap links against sax and can't link against libmerged because it is needed to build libmerged :-/ (saxparser in i18npool) Change-Id: Ie4dca11e8e1bb16a2506cf7cdb7d69b804d98cc0 Reviewed-on: https://gerrit.libreoffice.org/15447 Tested-by: Jenkins <ci@libreoffice.org> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-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 253d6dbca26c..028b7cbc8b02 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -191,7 +191,7 @@ $$(eval $$(call gb_Output_error,$(1) is not a valid group for installed librarie
endif
$(call gb_Helper__register_libraries,$(1),$(3))
-gb_Library_MODULE_$(2) += $(filter-out $(gb_MERGEDLIBS),$(3))
+gb_Library_MODULE_$(2) += $(filter-out $(filter-out sax,$(gb_MERGEDLIBS)),$(3))
$(if $(filter UNOVERLIBS RTVERLIBS,$(1)),\
gb_SdkLinkLibrary_MODULE_sdk += $(3))