diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-30 18:15:38 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 12:18:35 +0200 |
| commit | 9a74d53315e569171b4c4efa4ed5b278aa63f83c (patch) | |
| tree | 923779e514dcb882422df8362b938de128615520 /toolkit/mozapps | |
| parent | e2a478072a0c814d4e83e6c46a01c901f1cf3a94 (diff) | |
| download | UXP-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/mozapps')
| -rw-r--r-- | toolkit/mozapps/installer/upload-files.mk | 20 |
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) |