Repository.mk | 2 +- cpputools/Module_cpputools.mk | 9 +-------- solenv/gbuild/Conditions.mk | 4 ++++ 3 files changed, 6 insertions(+), 9 deletions(-)
New commits: commit 92a90cf5ccb998d2fcc77a62bb971534e410cdec Author: Jan-Marek Glogowski <[email protected]> AuthorDate: Sat Jan 8 06:46:13 2022 +0100 Commit: Jan-Marek Glogowski <[email protected]> CommitDate: Sat Jan 8 12:26:15 2022 +0100 Don't build the static uno binary Change-Id: If6d5384d4692fba94070bb11bb5a47a66b813f58 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128135 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <[email protected]> diff --git a/Repository.mk b/Repository.mk index da11a60bb8cf..2732439165e1 100644 --- a/Repository.mk +++ b/Repository.mk @@ -239,7 +239,7 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ regmerge \ regview \ ) \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \ + $(call gb_CondExeUno,uno) \ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \ diff --git a/cpputools/Module_cpputools.mk b/cpputools/Module_cpputools.mk index a3a35c6edcc7..9e41264daee4 100644 --- a/cpputools/Module_cpputools.mk +++ b/cpputools/Module_cpputools.mk @@ -9,16 +9,9 @@ $(eval $(call gb_Module_Module,cpputools)) -ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) - $(eval $(call gb_Module_add_targets,cpputools,\ $(call gb_CondExeSp2bv,Executable_sp2bv) \ + $(call gb_CondExeUno,Executable_uno) \ )) -$(eval $(call gb_Module_add_targets,cpputools,\ - Executable_uno \ -)) - -endif - # vim:set noet sw=4 ts=4: diff --git a/solenv/gbuild/Conditions.mk b/solenv/gbuild/Conditions.mk index 6279f554eb40..f405ab86308b 100644 --- a/solenv/gbuild/Conditions.mk +++ b/solenv/gbuild/Conditions.mk @@ -23,6 +23,10 @@ define gb_CondExeSp2bv $(if $(and $(filter WNT,$(OS)),$(call gb_Helper_optionals_and,DESKTOP ODK,$(true))),$(1),$(2)) endef +define gb_CondExeUno +$(if $(and $(filter DESKTOP,$(BUILD_TYPE)),$(if $(DISABLE_DYNLOADING),,$(true))),$(1),$(2)) +endef + define gb_CondSalTextEncodingLibrary $(if $(filter ANDROID,$(OS)),,$(if $(DISABLE_DYNLOADING),$(2),$(1))) endef
