summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-01-30 18:15:38 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 12:18:35 +0200
commit9a74d53315e569171b4c4efa4ed5b278aa63f83c (patch)
tree923779e514dcb882422df8362b938de128615520 /toolkit
parente2a478072a0c814d4e83e6c46a01c901f1cf3a94 (diff)
downloadUXP-9a74d53315e569171b4c4efa4ed5b278aa63f83c.tar
UXP-9a74d53315e569171b4c4efa4ed5b278aa63f83c.tar.gz
UXP-9a74d53315e569171b4c4efa4ed5b278aa63f83c.tar.lz
UXP-9a74d53315e569171b4c4efa4ed5b278aa63f83c.tar.xz
UXP-9a74d53315e569171b4c4efa4ed5b278aa63f83c.zip
Issue #1342 - Remove support for system NSPR/NSS
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/modules/AppConstants.jsm7
-rw-r--r--toolkit/modules/moz.build1
-rw-r--r--toolkit/mozapps/installer/upload-files.mk20
3 files changed, 9 insertions, 19 deletions
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)