summaryrefslogtreecommitdiffstats
path: root/config/external
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 /config/external
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 'config/external')
-rw-r--r--config/external/nss/Makefile.in3
-rw-r--r--config/external/nss/crmf/moz.build19
-rw-r--r--config/external/nss/moz.build5
3 files changed, 9 insertions, 18 deletions
diff --git a/config/external/nss/Makefile.in b/config/external/nss/Makefile.in
index 71954b403..eff80cd32 100644
--- a/config/external/nss/Makefile.in
+++ b/config/external/nss/Makefile.in
@@ -3,8 +3,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-ifndef MOZ_SYSTEM_NSS
-
CC_WRAPPER =
CXX_WRAPPER =
@@ -475,4 +473,3 @@ endif # MOZ_FOLD_LIBS
# security/nss/lib/ckfw/builtins. See bug #836220.
libs-nss/lib$(if $(MOZ_FOLD_LIBS),/ckfw): $(call mkdir_deps,$(DEPTH)/security/nss/lib/ckfw/builtins)
-endif
diff --git a/config/external/nss/crmf/moz.build b/config/external/nss/crmf/moz.build
index 04d985d74..8b5434a49 100644
--- a/config/external/nss/crmf/moz.build
+++ b/config/external/nss/crmf/moz.build
@@ -6,14 +6,11 @@
Library('crmf')
-if CONFIG['MOZ_SYSTEM_NSS']:
- OS_LIBS += [l for l in CONFIG['NSS_LIBS'] if l.startswith('-L')]
-else:
- USE_LIBS += [
- # The dependency on nss is not real, but is required to force the
- # parent directory being built before this one. This has no
- # practical effect on linkage, since the only thing linking crmf
- # will need nss anyways.
- 'nss',
- 'static:/security/nss/lib/crmf/crmf',
- ]
+USE_LIBS += [
+ # The dependency on nss is not real, but is required to force the
+ # parent directory being built before this one. This has no
+ # practical effect on linkage, since the only thing linking crmf
+ # will need nss anyways.
+ 'nss',
+ 'static:/security/nss/lib/crmf/crmf',
+]
diff --git a/config/external/nss/moz.build b/config/external/nss/moz.build
index 1c61b28fd..dbf19ff50 100644
--- a/config/external/nss/moz.build
+++ b/config/external/nss/moz.build
@@ -6,10 +6,7 @@
DIRS += ['crmf']
-if CONFIG['MOZ_SYSTEM_NSS']:
- Library('nss')
- OS_LIBS += CONFIG['NSS_LIBS']
-elif CONFIG['MOZ_FOLD_LIBS']:
+if CONFIG['MOZ_FOLD_LIBS']:
GeckoSharedLibrary('nss', linkage=None)
# TODO: The library name can be changed when bug 845217 is fixed.
SHARED_LIBRARY_NAME = 'nss3'