[tor-commits] [tor-browser/tor-browser-24.1.1esr-1] backport of bug 931053 to avoid building breakpad code in cross-compilation environments (which is currently broken)

[mikeperry at torproject.org]

commit e4cb02e8e79d71204682e65e736aab81d1591dd3
Author: Georg Koppen <g.koppen at jondos.de>
Date:   Tue Nov 12 09:54:43 2013 +0100

    backport of bug 931053 to avoid building breakpad code in cross-compilation environments (which is currently broken)
---
 toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in |    2 ++
 toolkit/crashreporter/google-breakpad/src/common/mac/moz.build   |    4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
index ca069b3..97fac11 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
@@ -23,11 +23,13 @@ DISABLED_CMMSRCS = \
   MachIPC.mm \
   $(NULL)
 
+ifdef MOZ_CRASHREPORTER
 HOST_CPPSRCS = $(CPPSRCS)
 
 HOST_CMMSRCS = \
   dump_syms.mm \
   $(NULL)
+endif
 
 # need static lib
 FORCE_STATIC_LIB = 1
diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build b/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build
index b872a0c..6d1efa4 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build
@@ -17,7 +17,9 @@ CPP_SOURCES += [
     'string_utilities.cc',
 ]
 
-HOST_LIBRARY_NAME = 'host_breakpad_mac_common_s'
+if CONFIG['MOZ_CRASHREPORTER']:
+    HOST_LIBRARY_NAME = 'host_breakpad_mac_common_s'
+
 CMMSRCS += [
     'MachIPC.mm',
 ]