Bug 414946 - Don't link sqlite with mozutils on OSX. r=khuey
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 05 Oct 2011 09:03:44 +0200
changeset 78788 3ba2964cd000ef54ea0b3820f63c9e6879cb3659
parent 78787 0151c893093e2f99c69dc566bf4157b79b6d1e9c
child 78789 9cdfb406ad3f475d22d9805fb04c53696785d17c
push id506
push userclegnitto@mozilla.com
push dateWed, 09 Nov 2011 02:03:18 +0000
treeherdermozilla-aurora@63587fc7bb93 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs414946
milestone10.0a1
Bug 414946 - Don't link sqlite with mozutils on OSX. r=khuey
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
 
+ifeq (Darwin,$(OS_TARGET))
+# On OSX, with jemalloc enabled, having sqlite linked against mozutils
+# causes crashes in NSS standalone tools.
+MOZ_UTILS_LDFLAGS =
+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 \