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/mozapps/installer/upload-files.mk | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'toolkit/mozapps/installer/upload-files.mk')

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