From 709a40e86734a4cbf67b65222e79db76aae56981 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Thu, 24 Jun 2021 05:32:13 +0200 Subject: cross-toolset: fix real cross help building Regression from commit 14069d84174ca7a4e60db4d75912903e9679b643 ("configure: Improve help-options handling"). We now must forward the help and extension configure options, as this is needed by the cross toolset to know, if it needs to build the HelpIndexer and HelpLinker executables. Also get rid of gb_Helper_optional_for_host. While it's in theory more correct, it makes gb_Helper_optional more complex, so we now rely on the fact, that the config_build.mk BUILD_TYPE is a subset of the config_host.mk BUILD_TYPE. This should fix the Windows Arm64 build, which currently seem to be the only cross-build including help. Change-Id: I8b90923c891b43cd2655b2578015c9bd579aae7d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117758 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski --- helpcompiler/Module_helpcompiler.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'helpcompiler') diff --git a/helpcompiler/Module_helpcompiler.mk b/helpcompiler/Module_helpcompiler.mk index ce2bd10fda51..146e3868df3f 100644 --- a/helpcompiler/Module_helpcompiler.mk +++ b/helpcompiler/Module_helpcompiler.mk @@ -10,11 +10,14 @@ $(eval $(call gb_Module_Module,helpcompiler)) $(eval $(call gb_Module_add_targets,helpcompiler,\ + Library_helplinker \ +)) + +$(eval $(call gb_Module_add_targets_for_build,helpcompiler,\ $(call gb_Helper_optional,HELPTOOLS, \ Executable_HelpIndexer \ Executable_HelpLinker \ ) \ - Library_helplinker \ )) # vim:set noet sw=4 ts=4: -- cgit v1.2.3