diff options
Diffstat (limited to 'config/external/nss')
| -rw-r--r-- | config/external/nss/Makefile.in | 6 | ||||
| -rw-r--r-- | config/external/nss/moz.build | 3 | ||||
| -rw-r--r-- | config/external/nss/nss.symbols | 1 |
3 files changed, 3 insertions, 7 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 diff --git a/config/external/nss/moz.build b/config/external/nss/moz.build index dbf19ff50..bf94d7648 100644 --- a/config/external/nss/moz.build +++ b/config/external/nss/moz.build @@ -29,9 +29,10 @@ else: '/security/nss/lib/smime/smime3', '/security/nss/lib/ssl/ssl3', '/security/nss/lib/util/nssutil3', - 'sqlite', ] +USE_LIBS += ['sqlite'] + # XXX: We should fix these warnings. ALLOW_COMPILER_WARNINGS = True diff --git a/config/external/nss/nss.symbols b/config/external/nss/nss.symbols index c46f86dea..705af4a94 100644 --- a/config/external/nss/nss.symbols +++ b/config/external/nss/nss.symbols @@ -13,7 +13,6 @@ PR_* PL_* #endif -#include ../../../db/sqlite3/src/sqlite.symbols ATOB_AsciiToData ATOB_AsciiToData_Util ATOB_ConvertAsciiToItem |