Bug 1077148 part 2 - Remove hack to avoid sqlite being linked against mozglue on mac. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 30 Oct 2014 13:05:56 +0900
changeset 213061 a7b5bb9e867a583d01513acb8ca4431cc9acb3d1
parent 213060 7c2f1416473fc4c03f96299a68ba869de9467b48
child 213062 0a59d60cf8ad1dc911ae16be55b767cec0044ee4
push id27738
push usercbook@mozilla.com
push dateThu, 30 Oct 2014 13:46:07 +0000
treeherdermozilla-central@1aa1b23d799e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1077148
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1077148 part 2 - Remove hack to avoid sqlite being linked against mozglue on mac. r=gps This hack has actually not been actively used since sqlite, nss and nspr are all folded together, because no shared library is actually linked in db/sqlite3/src.
config/external/sqlite/Makefile.in
--- a/config/external/sqlite/Makefile.in
+++ b/config/external/sqlite/Makefile.in
@@ -21,15 +21,8 @@ GARBAGE += \
 # Convert to the format we need for ld.
 $(LD_VERSION_SCRIPT): $(topsrcdir)/db/sqlite3/src/sqlite.def
 	@$(call py_action,convert_def_file, \
 	  $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) -o $@ $^)
 
 endif
 endif
 endif
-
-
-ifeq (Darwin,$(OS_TARGET))
-# On OSX, with jemalloc enabled, having sqlite linked against mozglue
-# causes crashes in NSS standalone tools.
-MOZ_GLUE_LDFLAGS =
-endif