diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-06-24 05:32:13 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-06-24 23:25:28 +0200 |
| commit | 709a40e86734a4cbf67b65222e79db76aae56981 (patch) | |
| tree | 461841e1c4238f659bd0d49931bd5bc091a81b89 /solenv | |
| parent | 4abd2598f7816891af3bd462ffaee57f3423b9f9 (diff) | |
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 <glogow@fbihome.de>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Helper.mk | 6 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_BuildTools.mk | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index c7f2404efabd..4d2fdd698005 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -328,12 +328,6 @@ $(if $(filter $(1) $(1)_%,$(WITH_LOCALES)),$(2)) endef endif -define gb_Helper_optional_for_host -$(if $(filter build,$(gb_Side)), \ - $(if $(filter $(1),$(BUILD_TYPE_FOR_HOST)),$(2)), \ - $(call gb_Output_error,gb_Helper_optional_for_host: Use only when gb_Side=build)) -endef - define gb_Helper_print_on_error $(if $(gb_QUIET_EXTERNAL), \ $(if $(2), \ diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk index 390e391285db..e08906068d24 100644 --- a/solenv/gbuild/extensions/pre_BuildTools.mk +++ b/solenv/gbuild/extensions/pre_BuildTools.mk @@ -33,11 +33,11 @@ gb_BUILD_TOOLS_executables = \ unoidl-check \ unoidl-write \ xrmex \ - $(call gb_Helper_optional_for_host,HELPTOOLS, \ + $(call gb_Helper_optional,HELPTOOLS, \ HelpIndexer \ HelpLinker \ ) \ - $(if $(filter WNT,$(OS)),$(call gb_Helper_optional_for_host,DESKTOP,lngconvex)) \ + $(if $(filter WNT,$(OS)),$(call gb_Helper_optional,DESKTOP,lngconvex)) \ gb_BUILD_TOOLS_executables_extern = \ python \ |