[Libreoffice-commits] core.git: RepositoryExternal.mk solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 RepositoryExternal.mk            |   10 +++++-----
 solenv/gbuild/TargetLocations.mk |    1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 7efb6328cb5e43d87afbbd81cf0165683e9fd4c3
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Mon May 31 02:26:43 2021 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Mon May 31 13:19:21 2021 +0200

    gbuild: implement gb_UnoApi_get_target_for_build
    
    Change-Id: Iaee243510023bf935097914fd6c4fcb701d35c13
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116438
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d9a22effc962..688bef98ac1a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3869,7 +3869,7 @@ define gb_Executable__register_climaker
 $(call gb_Executable_add_runtime_dependencies,climaker,\
 	$(call gb_Library_get_target_for_build,$(CPPU_ENV_FOR_BUILD)_uno) \
 	$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
-	$(call gb_UnoApi_get_target,udkapi) \
+	$(call gb_UnoApi_get_target_for_build,udkapi) \
 	$(INSTROOT_FOR_BUILD)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno)
 )
 endef
@@ -3893,8 +3893,8 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\
 	$(INSTROOT_FOR_BUILD)/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,louno) \
 	$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
 	$(INSTROOT_FOR_BUILD)/$(LIBO_ETC_FOLDER)/services/services.rdb \
-	$(call gb_UnoApi_get_target,offapi) \
-	$(call gb_UnoApi_get_target,udkapi) \
+	$(call gb_UnoApi_get_target_for_build,offapi) \
+	$(call gb_UnoApi_get_target_for_build,udkapi) \
 )
 endef
 
@@ -3932,7 +3932,7 @@ $(call gb_Executable_add_runtime_dependencies,saxparser,\
 	$(call gb_Package_get_target_for_build,instsetoo_native_setup_ure) \
 	$(call gb_Rdb_get_target_for_build,saxparser) \
 	$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER_FOR_BUILD)/services.rdb \
-	$(call gb_UnoApi_get_target,udkapi) \
+	$(call gb_UnoApi_get_target_for_build,udkapi) \
 )
 endef
 
@@ -3943,7 +3943,7 @@ define gb_Executable__register_uno
 $(call gb_Executable_add_runtime_dependencies,uno,\
 	$(call gb_Library_get_target_for_build,$(CPPU_ENV_FOR_BUILD)_uno) \
 	$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
-	$(call gb_UnoApi_get_target,udkapi) \
+	$(call gb_UnoApi_get_target_for_build,udkapi) \
 )
 endef
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 46e875d6d227..0df1cd2bb9d5 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -29,6 +29,7 @@ gb_PackagePart_get_destinations = \
 
 # kind of lame but with just 3 of these why bother with registration etc.
 gb_UnoApi_get_target = $(INSTROOT)/$(if $(filter udkapi,$(1)),$(LIBO_URE_MISC_FOLDER)/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb
+gb_UnoApi_get_target_for_build = $(INSTROOT_FOR_BUILD)/$(if $(filter udkapi,$(1)),$(LIBO_URE_MISC_FOLDER)/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb
 
 # workdir target patterns