summaryrefslogtreecommitdiffstats
path: root/config/external/nss/Makefile.in
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-02-20 10:02:49 -0500
committerMatt A. Tobin <email@mattatobin.com>2020-02-20 10:02:49 -0500
commit0e9957c412002000067479e7ce582e8d625e21c0 (patch)
treefd05e5f2894ac887a0468a3ddd09243ecdba9553 /config/external/nss/Makefile.in
parente3d81b698ea104e4b55ee618b931ea1311c04169 (diff)
downloadUXP-0e9957c412002000067479e7ce582e8d625e21c0.tar
UXP-0e9957c412002000067479e7ce582e8d625e21c0.tar.gz
UXP-0e9957c412002000067479e7ce582e8d625e21c0.tar.lz
UXP-0e9957c412002000067479e7ce582e8d625e21c0.tar.xz
UXP-0e9957c412002000067479e7ce582e8d625e21c0.zip
Issue #1457 - Unfold sqlite3 from nss
Diffstat (limited to 'config/external/nss/Makefile.in')
-rw-r--r--config/external/nss/Makefile.in6
1 files changed, 1 insertions, 5 deletions
diff --git a/config/external/nss/Makefile.in b/config/external/nss/Makefile.in
index ddf956040..7289e57f4 100644
--- a/config/external/nss/Makefile.in
+++ b/config/external/nss/Makefile.in
@@ -119,12 +119,8 @@ DEFAULT_GMAKE_FLAGS += NSS_ENABLE_TLS_1_3=1
ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_1)
DEFAULT_GMAKE_FLAGS += OS_DLLFLAGS='-static-libgcc' NSPR31_LIB_PREFIX=lib
endif
-ifdef MOZ_FOLD_LIBS
-DEFAULT_GMAKE_FLAGS += SQLITE_LIB_NAME=nss3
-else
DEFAULT_GMAKE_FLAGS += SQLITE_LIB_NAME=mozsqlite3
-DEFAULT_GMAKE_FLAGS += SQLITE_LIB_DIR=$(ABS_DIST)/../config/external/sqlite
-endif # MOZ_FOLD_LIBS
+DEFAULT_GMAKE_FLAGS += SQLITE_LIB_DIR=$(ABS_DIST)/../db/sqlite3/src
DEFAULT_GMAKE_FLAGS += SQLITE_INCLUDE_DIR=$(ABS_DIST)/include
ifdef NSS_DISABLE_DBM
DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DBM=1