diff options
| -rw-r--r-- | Repository.mk | 10 | ||||
| -rw-r--r-- | registry/Module_registry.mk | 6 | ||||
| -rw-r--r-- | svx/Module_svx.mk | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/Repository.mk b/Repository.mk index bebbef4b2da1..9976a3cd6920 100644 --- a/Repository.mk +++ b/Repository.mk @@ -76,7 +76,9 @@ $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \ )) $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ - gengal \ + $(if $(ENABLE_MACOSX_SANDBOX),, \ + gengal \ + )\ )) $(eval $(call gb_Helper_register_executables,OOO, \ @@ -123,8 +125,10 @@ $(eval $(call gb_Helper_register_executables,OOO, \ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ $(if $(and $(ENABLE_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \ - regmerge \ - regview \ + $(if $(ENABLE_MACOSX_SANDBOX),, \ + regmerge \ + regview \ + ) \ $(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \ )) diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk index fb962c64c012..5f70ed9def8e 100644 --- a/registry/Module_registry.mk +++ b/registry/Module_registry.mk @@ -12,8 +12,10 @@ $(eval $(call gb_Module_Module,registry)) $(eval $(call gb_Module_add_targets,registry,\ Library_reg \ $(if $(filter-out $(OS),IOS), \ - Executable_regmerge \ - Executable_regview \ + $(if $(ENABLE_MACOSX_SANDBOX),, \ + Executable_regmerge \ + Executable_regview \ + ) \ StaticLibrary_registry_helper \ ) \ )) diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index 80f2bd70a61e..0e63435aaf9e 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -34,11 +34,13 @@ $(eval $(call gb_Module_add_l10n_targets,svx,\ )) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +ifeq (,$(ENABLE_MACOSX_SANDBOX)) $(eval $(call gb_Module_add_targets,svx,\ Executable_gengal.bin \ Package_gengal \ )) endif +endif ifneq ($(OOO_JUNIT_JAR),) $(eval $(call gb_Module_add_subsequentcheck_targets,svx,\ |