Kaydet (Commit) 59cea45e authored tarafından Matúš Kukan's avatar Matúš Kukan Kaydeden (comit) Christian Lohmaier

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/15447Tested-by: 's avatarJenkins <ci@libreoffice.org>
Tested-by: 's avatarChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: 's avatarChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>
üst d34f5fe5
...@@ -191,7 +191,7 @@ $$(eval $$(call gb_Output_error,$(1) is not a valid group for installed librarie ...@@ -191,7 +191,7 @@ $$(eval $$(call gb_Output_error,$(1) is not a valid group for installed librarie
endif endif
$(call gb_Helper__register_libraries,$(1),$(3)) $(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)),\ $(if $(filter UNOVERLIBS RTVERLIBS,$(1)),\
gb_SdkLinkLibrary_MODULE_sdk += $(3)) gb_SdkLinkLibrary_MODULE_sdk += $(3))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment