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

[Jan-Marek Glogowski (via logerrit)]

 solenv/gbuild/extensions/pre_BuildTools.mk |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 29d4e83313de5ac75712f7598dc341664601d6cf
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Mon May 24 14:48:42 2021 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Tue May 25 18:06:36 2021 +0200

    gbuild: make pre_BuildTools.mk better readable
    
    Change-Id: I6c4e35fcfaf853c83f91b505e9b6308b844c37ca
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116107
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk
index 9327cbe41714..45b61f7cedd6 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -9,8 +9,8 @@
 
 # Tools we need to build for cross-compiling
 ifeq ($(gb_Side),build)
-gb_BUILD_TOOLS = \
-	$(foreach executable, \
+
+gb_BUILD_TOOLS_executables = \
 		bestreversemap \
 		cfgex \
 		climaker \
@@ -38,10 +38,13 @@ gb_BUILD_TOOLS = \
 			HelpLinker \
 			lngconvex \
 		) \
-	,$(call gb_Executable_get_runtime_dependencies,$(executable))) \
-	$(foreach executable, \
+
+gb_BUILD_TOOLS_executables_extern = \
 		xsltproc \
-	,$(call gb_ExternalExecutable_get_dependencies,$(executable))) \
+
+gb_BUILD_TOOLS = \
+    $(foreach executable,$(gb_BUILD_TOOLS_executables),$(call gb_Executable_get_runtime_dependencies,$(executable))) \
+    $(foreach executable,$(gb_BUILD_TOOLS_executables_extern),$(call gb_ExternalExecutable_get_dependencies,$(executable))) \
 	$(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \
 
 endif