Bug 676499 - Mac 64 bit crash [@ fts3SegReaderNext] in Thunderbird's gloda tests following change to optimisation levels in sqlite - switch Mac back to -O2 optimisation for sqlite for now; r=glandium
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 04 Aug 2011 14:50:41 +0100
changeset 73840 c7ea065539d2f84a2d92c98aae474123a6c704f8
parent 73839 410af9c91a7b9eac23b3870f4921b2d2d0efc9a7
child 73841 5684f06138f39e6c6b95cb076cdbe449875a1c2d
push id2
push userbsmedberg@mozilla.com
push dateFri, 19 Aug 2011 14:38:13 +0000
reviewersglandium
bugs676499
milestone8.0a1
Bug 676499 - Mac 64 bit crash [@ fts3SegReaderNext] in Thunderbird's gloda tests following change to optimisation levels in sqlite - switch Mac back to -O2 optimisation for sqlite for now; r=glandium
db/sqlite3/src/Makefile.in
--- a/db/sqlite3/src/Makefile.in
+++ b/db/sqlite3/src/Makefile.in
@@ -72,16 +72,22 @@ sqlite-version.h: sqlite-version.py sqli
 $(DEFFILE): sqlite.def
 	@$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) \
 	  $(srcdir)/sqlite.def > $(DEFFILE)
 
 export:: sqlite-version.h
 endif
 endif
 
+# XXX Force -O2 optimisation on Mac because using the default -O3 causes
+# crashes. See bug 676499.
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+MODULE_OPTIMIZE_FLAGS = -O2
+endif
+
 EXPORTS = \
   sqlite3.h \
   $(NULL)
 
 CSRCS = \
   sqlite3.c \
   $(NULL)