From 59cea45ec247df1acb691308c940ff97673e4c48 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mat=C3=BA=C5=A1=20Kukan?= Date: Mon, 20 Apr 2015 19:23:02 +0200 Subject: [PATCH] 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 Tested-by: Christian Lohmaier Reviewed-by: Christian Lohmaier --- solenv/gbuild/Helper.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)) -- 2.11.4.GIT