summaryrefslogtreecommitdiffstats
path: root/toolkit/mozapps
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit/mozapps')
-rw-r--r--toolkit/mozapps/installer/upload-files.mk20
1 files changed, 9 insertions, 11 deletions
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)