summaryrefslogtreecommitdiffstats
path: root/registry
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-09-20 01:01:09 +0300
committerAndras Timar <andras.timar@collabora.com>2016-06-11 14:26:29 +0200
commitf56af595612206ca04c1799d6b3b7dca5757a6f4 (patch)
treeff609697e52aebe24fe42b9e9aec5c75164658ba /registry
parentWe don't build the Apple Remote code when sandboxed (diff)
downloadcore-f56af595612206ca04c1799d6b3b7dca5757a6f4.tar.gz
core-f56af595612206ca04c1799d6b3b7dca5757a6f4.zip
Skip some executables in the OS X sandboxed (Mac App Store) case
I doubt end-users will miss gengal.bin, regview, or regmerge. (cherry picked from commit beb30bbd867f9a28878e0d004458c3507f6c0956) Conflicts: Repository.mk (cherry picked from commit 72e8d549fae0aa6278a6b2d64cf65d4df8f27f94) Change-Id: I353610c0d039f25fa415f35902fe2b9890cd423f
Diffstat (limited to 'registry')
-rw-r--r--registry/Module_registry.mk6
1 files changed, 4 insertions, 2 deletions
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 \
) \
))