diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-30 18:15:38 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-30 18:15:38 +0100 |
| commit | 499b2873944530396cc8aecbc7bdd1a2a2c66caa (patch) | |
| tree | 1378b26d0c9ccabd0df0b88c9f751960461e2c5d /config | |
| parent | 00a5321c958de1f378ac9dacafb6f81ded57441e (diff) | |
| download | uxp-499b2873944530396cc8aecbc7bdd1a2a2c66caa.tar.gz | |
Issue #1342 - Remove support for system NSPR/NSS
Diffstat (limited to 'config')
| -rw-r--r-- | config/external/nss/Makefile.in | 3 | ||||
| -rw-r--r-- | config/external/nss/crmf/moz.build | 19 | ||||
| -rw-r--r-- | config/external/nss/moz.build | 5 | ||||
| -rw-r--r-- | config/recurse.mk | 2 |
4 files changed, 10 insertions, 19 deletions
diff --git a/config/external/nss/Makefile.in b/config/external/nss/Makefile.in index 71954b4031..eff80cd323 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 04d985d742..8b5434a499 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 1c61b28fde..dbf19ff509 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' diff --git a/config/recurse.mk b/config/recurse.mk index 0b469c1c35..6bf5670b57 100644 --- a/config/recurse.mk +++ b/config/recurse.mk @@ -172,7 +172,7 @@ ifeq ($(MOZ_REPLACE_MALLOC_LINKAGE),dummy library) mozglue/build/target memory/replace/logalloc/replay/target: memory/replace/dummy/target endif endif -ifeq (,$(MOZ_SYSTEM_NSPR)$(MOZ_SYSTEM_NSS)$(MOZ_FOLD_LIBS)) +ifeq (,$(MOZ_FOLD_LIBS)) config/external/nss/target: config/external/nspr/pr/target config/external/nspr/ds/target config/external/nspr/libc/target endif # Most things are built during compile (target/host), but some things happen during export |