From 499b2873944530396cc8aecbc7bdd1a2a2c66caa Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Thu, 30 Jan 2020 18:15:38 +0100
Subject: Issue #1342 - Remove support for system NSPR/NSS

---
 config/external/nss/Makefile.in    |  3 ---
 config/external/nss/crmf/moz.build | 19 ++++++++-----------
 config/external/nss/moz.build      |  5 +----
 3 files changed, 9 insertions(+), 18 deletions(-)

(limited to 'config/external')

diff --git a/config/external/nss/Makefile.in b/config/external/nss/Makefile.in
index 71954b403..eff80cd32 100644
--- a/config/external/nss/Makefile.in
+++ b/config/external/nss/Makefile.in
@@ -3,8 +3,6 @@
 # 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/.
 
-ifndef MOZ_SYSTEM_NSS
-
 CC_WRAPPER =
 CXX_WRAPPER =
 
@@ -475,4 +473,3 @@ endif # MOZ_FOLD_LIBS
 # security/nss/lib/ckfw/builtins. See bug #836220.
 libs-nss/lib$(if $(MOZ_FOLD_LIBS),/ckfw): $(call mkdir_deps,$(DEPTH)/security/nss/lib/ckfw/builtins)
 
-endif
diff --git a/config/external/nss/crmf/moz.build b/config/external/nss/crmf/moz.build
index 04d985d74..8b5434a49 100644
--- a/config/external/nss/crmf/moz.build
+++ b/config/external/nss/crmf/moz.build
@@ -6,14 +6,11 @@
 
 Library('crmf')
 
-if CONFIG['MOZ_SYSTEM_NSS']:
-    OS_LIBS += [l for l in CONFIG['NSS_LIBS'] if l.startswith('-L')]
-else:
-    USE_LIBS += [
-        # The dependency on nss is not real, but is required to force the
-        # parent directory being built before this one. This has no
-        # practical effect on linkage, since the only thing linking crmf
-        # will need nss anyways.
-        'nss',
-        'static:/security/nss/lib/crmf/crmf',
-    ]
+USE_LIBS += [
+    # The dependency on nss is not real, but is required to force the
+    # parent directory being built before this one. This has no
+    # practical effect on linkage, since the only thing linking crmf
+    # will need nss anyways.
+    'nss',
+    'static:/security/nss/lib/crmf/crmf',
+]
diff --git a/config/external/nss/moz.build b/config/external/nss/moz.build
index 1c61b28fd..dbf19ff50 100644
--- a/config/external/nss/moz.build
+++ b/config/external/nss/moz.build
@@ -6,10 +6,7 @@
 
 DIRS += ['crmf']
 
-if CONFIG['MOZ_SYSTEM_NSS']:
-    Library('nss')
-    OS_LIBS += CONFIG['NSS_LIBS']
-elif CONFIG['MOZ_FOLD_LIBS']:
+if CONFIG['MOZ_FOLD_LIBS']:
     GeckoSharedLibrary('nss', linkage=None)
     # TODO: The library name can be changed when bug 845217 is fixed.
     SHARED_LIBRARY_NAME = 'nss3'
-- 
cgit v1.2.3