summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Engelhard <rene@debian.org>2016-03-28 22:39:12 +0200
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-01-18 08:40:18 +0100
commitbc59d5a2841113d396bac9a87b09ff55962d58a6 (patch)
tree016ac64330cf3c89d7d1add8bd9313b6a89800a8
parentef3a4d6282fd482c444338a3765074e4c55370ca (diff)
don't build/install minidump_upload with ENABLE_BREAKPAD=
Change-Id: I0f7d9811d669c2884b0c1704878678b01529e52f
-rw-r--r--Repository.mk2
-rw-r--r--desktop/Module_desktop.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/Repository.mk b/Repository.mk
index f89d5105307d..4fbcb5a32c9c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -88,7 +88,7 @@ $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \
))
$(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \
- minidump_upload \
+ $(call gb_Helper_optional,BREAKPAD,minidump_upload) \
$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
soffice_bin \
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 9837714dab7f..f88f376eae89 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -36,7 +36,7 @@ ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,desktop,\
Executable_soffice_bin \
Executable_unopkg_bin \
- Executable_minidump_upload \
+ $(if $(ENABLE_BREAKPAD),Executable_minidump_upload) \
Library_migrationoo2 \
Library_migrationoo3 \
Library_unopkgapp \