Bug 1055441: Set NSS_USE_SYSTEM_SQLITE = 1 on Mac. r=kaie.
authorWan-Teh Chang <wtc@google.com>
Fri, 20 Feb 2015 17:46:29 -0800
changeset 11364 b427ef6d7056c87f92eb1eb9c8811ec385b26584
parent 11363 108bf1e59f285c3518e16a342654087c8615eba1
child 11365 8d6b91a03005882d4eca67d8aab7741e963abaa3
push id566
push userwtc@google.com
push dateSat, 21 Feb 2015 01:46:58 +0000
reviewerskaie
bugs1055441
Bug 1055441: Set NSS_USE_SYSTEM_SQLITE = 1 on Mac. r=kaie.
coreconf/Darwin.mk
--- a/coreconf/Darwin.mk
+++ b/coreconf/Darwin.mk
@@ -111,8 +111,16 @@ DLL_SUFFIX	= dylib
 ifdef MAPFILE
 	MKSHLIB += -exported_symbols_list $(MAPFILE)
 endif
 PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \
                 sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,_,' > $@
 
 USE_SYSTEM_ZLIB = 1
 ZLIB_LIBS	= -lz
+
+# The system sqlite library in the latest version of Mac OS X often becomes
+# newer than the sqlite library in NSS. This may result in certain Mac OS X
+# system libraries having unresolved sqlite symbols during the shlibsign step
+# of the NSS build when we set DYLD_LIBRARY_PATH to the NSS lib directory and
+# the NSS libsqlite3.dylib is used instead of the system one. So just use the
+# system sqlite library on Mac.
+NSS_USE_SYSTEM_SQLITE = 1