diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-31 15:40:09 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-31 15:40:09 +0100 |
| commit | d41ba28f5257f7c1425a0bde210e69fc5bb34a37 (patch) | |
| tree | 229b340173919d85b06ef878899034cdb7b28a0f /config | |
| parent | 8f89965f5062f9855cdcc20530a815746fce744c (diff) | |
| download | uxp-d41ba28f5257f7c1425a0bde210e69fc5bb34a37.tar.gz | |
Issue #1342 - Remove support for system sqlite
Diffstat (limited to 'config')
| -rw-r--r-- | config/external/nss/Makefile.in | 2 | ||||
| -rw-r--r-- | config/external/sqlite/moz.build | 22 |
2 files changed, 9 insertions, 15 deletions
diff --git a/config/external/nss/Makefile.in b/config/external/nss/Makefile.in index eff80cd323..ddf956040c 100644 --- a/config/external/nss/Makefile.in +++ b/config/external/nss/Makefile.in @@ -119,7 +119,6 @@ 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 -ifndef MOZ_SYSTEM_SQLITE ifdef MOZ_FOLD_LIBS DEFAULT_GMAKE_FLAGS += SQLITE_LIB_NAME=nss3 else @@ -127,7 +126,6 @@ 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_INCLUDE_DIR=$(ABS_DIST)/include -endif ifdef NSS_DISABLE_DBM DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DBM=1 endif diff --git a/config/external/sqlite/moz.build b/config/external/sqlite/moz.build index 76908d902f..31f8e34382 100644 --- a/config/external/sqlite/moz.build +++ b/config/external/sqlite/moz.build @@ -4,19 +4,15 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -if CONFIG['MOZ_SYSTEM_SQLITE']: +DIRS += ['../../../db/sqlite3/src'] +if CONFIG['MOZ_FOLD_LIBS']: Library('sqlite') - OS_LIBS += CONFIG['SQLITE_LIBS'] + # When folding libraries, sqlite is actually in the nss library. + USE_LIBS += [ + 'nss', + ] else: - DIRS += ['../../../db/sqlite3/src'] - if CONFIG['MOZ_FOLD_LIBS']: - Library('sqlite') - # When folding libraries, sqlite is actually in the nss library. - USE_LIBS += [ - 'nss', - ] - else: - SharedLibrary('sqlite') - SHARED_LIBRARY_NAME = 'mozsqlite3' + SharedLibrary('sqlite') + SHARED_LIBRARY_NAME = 'mozsqlite3' - SYMBOLS_FILE = '/db/sqlite3/src/sqlite.symbols' + SYMBOLS_FILE = '/db/sqlite3/src/sqlite.symbols' |