Bug 1055441, follow up to fix a build bustage, force the use of the global sqlite3 binary to check for the system sqlite version, because the build environment might provide a newer version
authorKai Engert <kaie@kuix.de>
Mon, 23 Feb 2015 19:47:35 +0100
changeset 11367 ad20f7ddeb765bef23eacf8af23e6c8c1c5384de
parent 11366 6fda0b46524f8ab276f5695e31ce754e88831717
child 11368 6994d4f2bed9f82e3dcab7f6a1bbd6ec2f036634
push id569
push userkaie@kuix.de
push dateMon, 23 Feb 2015 18:47:42 +0000
bugs1055441
Bug 1055441, follow up to fix a build bustage, force the use of the global sqlite3 binary to check for the system sqlite version, because the build environment might provide a newer version
coreconf/Darwin.mk
--- a/coreconf/Darwin.mk
+++ b/coreconf/Darwin.mk
@@ -119,17 +119,17 @@ 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, if it's sufficiently new.
 
-SYS_SQLITE3_VERSION_FULL := $(shell sqlite3 -version | awk '{print $$1}')
+SYS_SQLITE3_VERSION_FULL := $(shell /usr/bin/sqlite3 -version | awk '{print $$1}')
 SYS_SQLITE3_VERSION_MAJOR := $(shell echo $(SYS_SQLITE3_VERSION_FULL) | awk -F. '{ print $$1 }')
 SYS_SQLITE3_VERSION_MINOR := $(shell echo $(SYS_SQLITE3_VERSION_FULL) | awk -F. '{ print $$2 }')
 
 ifeq (3,$(SYS_SQLITE3_VERSION_MAJOR))
     ifeq (,$(filter-out 0 1 2 3 4,$(SYS_SQLITE3_VERSION_MINOR)))
         # sqlite <= 3.4.x is too old, it doesn't provide sqlite3_file_control
     else
         NSS_USE_SYSTEM_SQLITE = 1