diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-03 04:41:12 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-03 13:56:35 +0100 |
| commit | 47b088e2c7917762f96c44346931cc40d56b2efa (patch) | |
| tree | 5743693c34642b25bcf3eca4fbd0ecb9fbfca28f /solenv | |
| parent | 9ebf7034c9cd3a0601542397254ebc97647a862e (diff) | |
Fix --enable-mergelibs plugin dependency
Not sure why I didn't use gb_LinkTarget_use_libraries instead of
the internal version.
Regression from commit ed583bf8d553b145f83b66118253aaf7ac94fa1a
("gbuild: introduce plugin + loader concepts").
Change-Id: I600aee16c0c7296e14435c20ef4f47123db93a11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126268
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 3b02bb635400..278664571d8e 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -2125,10 +2125,6 @@ endef # # call gb_LinkTarget__set_plugin_for,linktarget,loader,nodep define gb_LinkTarget__set_plugin_for -ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2))) -$$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL)) -$$(eval $$(call gb_Output_error,Cannot link against library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk or RepositoryExternal.mk)) -endif ifeq (,$(filter $(1),$(foreach plugin,$(gb_Library_KNOWNPLUGINS),$(call gb_Library_get_linktarget,$(plugin))))) $$(eval $$(call gb_Output_error,Unknown plugin(s) '$(filter $(1),$(foreach plugin,$(gb_Library_KNOWNPLUGINS),$(call gb_Library_get_linktarget,$(plugin))))'. Plugins must be registered in Repository.mk or RepositoryExternal.mk)) endif @@ -2139,7 +2135,7 @@ ifeq ($(call gb_LinkTarget__is_build_tool,$(1)),$(true)) $$(eval $$(call gb_Output_error,Plugin support for build tools not implemented)) endif -$(if $(3),,$(call gb_LinkTarget__use_libraries,$(1),$(2),$(2))) +$(if $(3),,$(call gb_LinkTarget_use_libraries,$(1),$(2))) endef |