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 /registry | |
| 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 'registry')
| -rw-r--r-- | registry/Module_registry.mk | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk index 58de136de877..e5969171e005 100644 --- a/registry/Module_registry.mk +++ b/registry/Module_registry.mk @@ -11,13 +11,11 @@ $(eval $(call gb_Module_Module,registry)) $(eval $(call gb_Module_add_targets,registry,\ Library_reg \ - $(if $(filter-out $(OS),iOS), \ - $(if $(ENABLE_MACOSX_SANDBOX),, \ - Executable_regmerge \ - Executable_regview \ - ) \ - StaticLibrary_registry_helper \ - ) \ + $(call gb_CondBuildRegistryTools, \ + Executable_regmerge \ + Executable_regview \ + StaticLibrary_registry_helper \ + ) \ )) # vim:set noet sw=4 ts=4: |