solenv/gbuild/Library.mk | 2 +-
solenv/gbuild/LinkTarget.mk | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 186a275ffb1309fac9c4ef36d5b3126f0350760f
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Mon Dec 13 12:10:43 2021 +0100
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Mon Dec 13 16:50:18 2021 +0100
gbuild: forward / set linktargetmakefilename
Unfortunatly RepositoryExternal.mk ais generally not forwarding
this info. It's also not really documented.
Change-Id: I7920f7442521ab06f18c16397a13615e4517d053
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126730
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 6dc2b9591104..df42c047f846 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -192,7 +192,7 @@ endif
$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,$(2))) :
PLUGINS += $(1)
$(eval $(call gb_LinkTarget__add_plugin,$(call
gb_Library_get_linktarget,$(2)),$(1)))
-$(eval $(call gb_LinkTarget__set_plugin_for,$(call
gb_Library_get_linktarget,$(1)),$(2),$(3)))
+$(eval $(call gb_LinkTarget__set_plugin_for,$(call
gb_Library_get_linktarget,$(1)),$(2),$(3),Library_$(1)))
endef
# call gb_Library_set_plugin_for_nodep,library,loader
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index fa71771b6582..57b9a40d7560 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -2073,7 +2073,7 @@ endef
# call gb_LinkTarget_use_glxtest,linktarget,add_libs
define gb_LinkTarget_use_glxtest
-$(call gb_LinkTarget_use_libraries,$(1),vcl)
+$(call gb_LinkTarget_use_libraries,$(1),vcl,,$(4))
ifeq (,$(DISABLE_DYNLOADING))
$(call gb_LinkTarget_add_libs,$(1),$(DLOPEN_LIBS))
@@ -2134,7 +2134,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)))
+$(if $(3),,$(call gb_LinkTarget_use_libraries,$(1),$(2),,$(4)))
endef
