From d41ba28f5257f7c1425a0bde210e69fc5bb34a37 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Fri, 31 Jan 2020 15:40:09 +0100
Subject: Issue #1342 - Remove support for system sqlite

---
 config/external/nss/Makefile.in  |  2 --
 config/external/sqlite/moz.build | 22 +++++++++-------------
 2 files changed, 9 insertions(+), 15 deletions(-)

(limited to 'config')

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'
-- 
cgit v1.2.3