diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2015-04-20 19:23:02 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-04-21 12:33:27 +0200 |
| commit | a3c08d6ff4b5fb0874525712182dac13d5719932 (patch) | |
| tree | b9de6025bec0485eb912d2999141ef260d4a395d | |
| parent | 697b6a0f566cf0fedc85883f4076397a403fa2f5 (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>
(cherry picked from commit 59cea45ec247df1acb691308c940ff97673e4c48)
| -rw-r--r-- | solenv/gbuild/Helper.mk | 2 |
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)) |