diff options
author | Benjamin Beurdouche <bbeurdouche@mozilla.com> | 2020-07-24 17:16:51 +0000 |
---|---|---|
committer | Benjamin Beurdouche <bbeurdouche@mozilla.com> | 2020-07-24 17:16:51 +0000 |
commit | 6e135dd4a51073cab175128ec97ed6521f6b2943 (patch) | |
tree | a22e303fdb20c21e224194aafb37972449bb8d5b /coreconf | |
parent | cd2ba069c2d8a82c45dc8bd8e3b03786cffb7a62 (diff) | |
download | nss-hg-6e135dd4a51073cab175128ec97ed6521f6b2943.tar.gz |
Bug 1652729 - Add build flag to disable RC2 and relocate to lib/freebl/deprecated. r=kjacobs
Differential Revision: https://phabricator.services.mozilla.com/D83494
Diffstat (limited to 'coreconf')
-rw-r--r-- | coreconf/config.gypi | 6 | ||||
-rw-r--r-- | coreconf/config.mk | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/coreconf/config.gypi b/coreconf/config.gypi index 77ed8da98..6d8654d27 100644 --- a/coreconf/config.gypi +++ b/coreconf/config.gypi @@ -101,6 +101,7 @@ 'disable_tests%': 0, 'disable_chachapoly%': 0, 'disable_deprecated_seed%': 0, + 'disable_deprecated_rc2%': 0, 'disable_dbm%': 1, 'disable_libpkix%': 1, 'disable_werror%': 0, @@ -576,6 +577,11 @@ 'NSS_DISABLE_DEPRECATED_SEED', ], }], + [ 'disable_deprecated_rc2==1', { + 'defines': [ + 'NSS_DISABLE_DEPRECATED_RC2', + ], + }], ], }, # Common settings for debug should go here. diff --git a/coreconf/config.mk b/coreconf/config.mk index b65e6846c..5b8087f2e 100644 --- a/coreconf/config.mk +++ b/coreconf/config.mk @@ -162,6 +162,10 @@ ifdef NSS_DISABLE_DEPRECATED_SEED DEFINES += -DNSS_DISABLE_DEPRECATED_SEED endif +ifdef NSS_DISABLE_DEPRECATED_RC2 +DEFINES += -DNSS_DISABLE_DEPRECATED_RC2 +endif + ifdef NSS_PKIX_NO_LDAP DEFINES += -DNSS_PKIX_NO_LDAP endif |