diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-21 02:44:53 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-24 02:15:03 +0100 |
| commit | af4c5d3ea1ec5d140b9477feea2cb9487977a6c4 (patch) | |
| tree | 40f8e75f4c6aee6d8a8bfe89025b807a3db135c1 /Repository.mk | |
| parent | 4e2e57b530544736804ab663f832173ba1d78559 (diff) | |
Enforce cross-compilation for static builds
... AKA DISABLE_DYNLOADING, except for oss-fuzz, which will be
converted to a cross build in a follow-up patch.
This includes skipping the static registry and help tooling and
aborts configure when the ODK is selected to be build.
Change-Id: Ifae32e91acf5e9ffa234d8f915ee459b197091fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127287
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Repository.mk b/Repository.mk index 1d0f3111a7bd..dddb180f589c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -230,10 +230,10 @@ endif $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ $(if $(and $(ENABLE_JAVA),$(filter-out HAIKU MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \ - $(if $(ENABLE_MACOSX_SANDBOX),, \ - regmerge \ - regview \ - ) \ + $(call gb_CondBuildRegistryTools, \ + regmerge \ + regview \ + ) \ $(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \ )) |