summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2021-12-21 02:44:53 +0100
committerJan-Marek Glogowski <glogow@fbihome.de>2021-12-24 02:15:03 +0100
commitaf4c5d3ea1ec5d140b9477feea2cb9487977a6c4 (patch)
tree40f8e75f4c6aee6d8a8bfe89025b807a3db135c1 /solenv
parent4e2e57b530544736804ab663f832173ba1d78559 (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 'solenv')
-rw-r--r--solenv/gbuild/Conditions.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/solenv/gbuild/Conditions.mk b/solenv/gbuild/Conditions.mk
index 88e705524d65..fb92e14bcef6 100644
--- a/solenv/gbuild/Conditions.mk
+++ b/solenv/gbuild/Conditions.mk
@@ -11,6 +11,10 @@ define gb_CondBuildLockfile
$(if $(and $(filter-out ANDROID MACOSX iOS WNT,$(OS))),$(1),$(2))
endef
+define gb_CondBuildRegistryTools
+$(if $(or $(DISABLE_DYNLOADING),$(ENABLE_MACOSX_SANDBOX)),$(2),$(1))
+endef
+
define gb_CondSalTextEncodingLibrary
$(if $(filter ANDROID,$(OS)),,$(if $(DISABLE_DYNLOADING),$(2),$(1)))
endef