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

---
 toolkit/modules/AppConstants.jsm          |  7 -------
 toolkit/modules/moz.build                 |  1 -
 toolkit/mozapps/installer/upload-files.mk | 20 +++++++++-----------
 3 files changed, 9 insertions(+), 19 deletions(-)

(limited to 'toolkit')

diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm
index 40ceb15ba..41b398efc 100644
--- a/toolkit/modules/AppConstants.jsm
+++ b/toolkit/modules/AppConstants.jsm
@@ -187,13 +187,6 @@ MOZ_SAFE_BROWSING:
   false,
 #endif
 
-  MOZ_SYSTEM_NSS:
-#ifdef MOZ_SYSTEM_NSS
-  true,
-#else
-  false,
-#endif
-
   MOZ_PLACES:
 #ifdef MOZ_PLACES
   true,
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index 4e647bd7f..6b181b6aa 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -148,7 +148,6 @@ for var in ('ANDROID_PACKAGE_NAME',
             DEFINES[var] = CONFIG[var]
 
 for var in ('MOZ_TOOLKIT_SEARCH',
-            'MOZ_SYSTEM_NSS',
             'MOZ_UPDATER',
             'MOZ_SWITCHBOARD'):
     if CONFIG[var]:
diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk
index 40af34a59..82b550fb4 100644
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@@ -63,17 +63,15 @@ JSSHELL_BINS  = \
   $(DLL_PREFIX)mozglue$(DLL_SUFFIX) \
   $(NULL)
 
-ifndef MOZ_SYSTEM_NSPR
-  ifdef MOZ_FOLD_LIBS
-    JSSHELL_BINS += $(DLL_PREFIX)nss3$(DLL_SUFFIX)
-  else
-    JSSHELL_BINS += \
-      $(DLL_PREFIX)nspr4$(DLL_SUFFIX) \
-      $(DLL_PREFIX)plds4$(DLL_SUFFIX) \
-      $(DLL_PREFIX)plc4$(DLL_SUFFIX) \
-      $(NULL)
-  endif # MOZ_FOLD_LIBS
-endif # MOZ_SYSTEM_NSPR
+ifdef MOZ_FOLD_LIBS
+  JSSHELL_BINS += $(DLL_PREFIX)nss3$(DLL_SUFFIX)
+else
+  JSSHELL_BINS += \
+    $(DLL_PREFIX)nspr4$(DLL_SUFFIX) \
+    $(DLL_PREFIX)plds4$(DLL_SUFFIX) \
+    $(DLL_PREFIX)plc4$(DLL_SUFFIX) \
+    $(NULL)
+endif # MOZ_FOLD_LIBS
 
 ifdef MSVC_C_RUNTIME_DLL
   JSSHELL_BINS += $(MSVC_C_RUNTIME_DLL)
-- 
cgit v1.2.3