bug 368206 - integrate breakpad exception handler/crash reporter on OS X. fix up static linking for thunderbird et. al and enable breakpad by default on OS X. r=bsmedberg
authorted.mielczarek@gmail.com
Mon, 07 May 2007 08:32:41 -0700
changeset 1241 432ab7a69fffe804e49a1ea75422dce43aaf1a29
parent 1240 2c3e7600631a998acc03c5e86376a33f669ec55c
child 1242 91642d948acb7701cde9f58a4d5c6b061e90f747
push idunknown
push userunknown
push dateunknown
reviewersbsmedberg
bugs368206
milestone1.9a5pre
bug 368206 - integrate breakpad exception handler/crash reporter on OS X. fix up static linking for thunderbird et. al and enable breakpad by default on OS X. r=bsmedberg
browser/app/Makefile.in
config/static-rules.mk
configure.in
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -221,17 +221,16 @@ DEFINES += -DFIREFOX_ICO=\"$(DIST)/brand
 ifdef BUILD_STATIC_LIBS
 include $(topsrcdir)/config/static-rules.mk
 
 DEFINES += -DIMPL_XREAPI
 endif
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 ifdef BUILD_STATIC_LIBS
-LIBS	+= -framework QuickTime -framework IOKit -lcrypto
 ifdef USE_PREBINDING
 BIN_FLAGS += -Wl,-headerpad -Wl,5a0c
 endif
 endif
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
 LIBS += -lphexlib
--- a/config/static-rules.mk
+++ b/config/static-rules.mk
@@ -14,8 +14,12 @@ nsStaticComponents.cpp: $(topsrcdir)/con
 	sed -e "s|%MODULE_LIST%|$(foreach m, $(STATIC_COMPONENT_LIST),MODULE($(m)))|" \
 	> $(_TARGET)
 
 GARBAGE += nsStaticComponents.cpp
 
 ifeq ($(OS_ARCH),IRIX)
 LDFLAGS	+= -Wl,-LD_LAYOUT:lgot_buffer=80
 endif
+
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+LIBS	+= -framework QuickTime -framework IOKit -lcrypto
+endif
--- a/configure.in
+++ b/configure.in
@@ -5526,17 +5526,18 @@ if test -n "${MOZ_JAVAXPCOM}"; then
     AC_MSG_ERROR([The programs java, javac and jar were not found.  Set \$JAVA_HOME to your java sdk directory, use --with-java-bin-path={java-bin-dir}, or reconfigure with --disable-javaxpcom.])
   fi
 fi
 
 dnl ========================================================
 dnl = Airbag crash reporting (on by default on supported platforms)
 dnl ========================================================
 
-if test "$OS_ARCH" = "WINNT" -a -z "$GNU_CC"; then
+if test "$OS_ARCH" = "WINNT" -a -z "$GNU_CC" \
+  || test "$OS_ARCH" = "Darwin"; then
    MOZ_AIRBAG=1
 fi
 
 MOZ_ARG_DISABLE_BOOL(airbag,
 [  --disable-airbag          Disable airbag crash reporting],
     MOZ_AIRBAG=,
     MOZ_AIRBAG=1)