solenv/gbuild/Helper.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 59cea45ec247df1acb691308c940ff97673e4c48
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Mon Apr 20 19:23:02 2015 +0200
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 <c...@libreoffice.org>
Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 253d6db..028b7cb 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))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
