bug 779291 - Build stabs code except for Android. r=glandium

--HG--
extra : rebase_source : fe94d532849a403c950982e7251368633d282e5d

toolkit/crashreporter/google-breakpad/src/common/Makefile.in

@@ -67,14 +67,20 @@ ifeq ($(OS_TARGET),Android)
 VPATH += $(srcdir)/android
 SSRCS := breakpad_getcontext.S
 TARGET_LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include/
+DEFINES += -DNO_STABS_SUPPORT
+else
+ifneq (WINNT,$(OS_TARGET))
+CPPSRCS += \
+  stabs_to_module.cc \
+  stabs_reader.cc \
+  $(NULL)
+endif
 endif
 
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 DEFINES += -DELFSIZE=32
 endif
 
-DEFINES += -DNO_STABS_SUPPORT
-
 ifdef MOZ_PLATFORM_MAEMO
 # The GCC in scratchbox crashes writing DWARF debug info for language.cc.
 # Since we don't really need debug symbols for the host tools anyway,
@@ -85,9 +91,11 @@ endif
 # This kind of sucks.
 ifeq (Linux,$(OS_ARCH))
 HOST_CXXFLAGS += -DHAVE_A_OUT_H
+OS_CXXFLAGS += -DHAVE_A_OUT_H
 endif
 ifeq (Darwin,$(OS_ARCH))
 HOST_CXXFLAGS += -DHAVE_MACH_O_NLIST_H
+OS_CXXFLAGS += -DHAVE_MACH_O_NLIST_H
 endif
 
 ifneq (WINNT,$(OS_TARGET))

toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in

@@ -43,8 +43,6 @@ HOST_CMMSRCS = \
   dump_syms.mm \
   $(NULL)
 
-DEFINES += -DNO_STABS_SUPPORT
-
 # need static lib
 FORCE_STATIC_LIB = 1