summaryrefslogtreecommitdiff
path: root/lib/ssl
diff options
context:
space:
mode:
authorJ.C. Jones <jjones@mozilla.com>2019-01-24 14:04:54 -0700
committerJ.C. Jones <jjones@mozilla.com>2019-01-24 14:04:54 -0700
commit3969ef923e1d339b270e7e1ce419a65959238eac (patch)
tree99b3a00ba071bac09ca48324b727f12d8eeeb72c /lib/ssl
parentf2f8c09d37847457d4a5ccd0b7bbc51c2f04be54 (diff)
downloadnss-hg-3969ef923e1d339b270e7e1ce419a65959238eac.tar.gz
Bug 1515236 - Centralize a SSLKEYLOGFILE enable/disable flag at build.sh r=mt
Backs out backout 31656990b5d083f97aecc3bb9ff0685e7f444bbb Differential Revision: https://phabricator.services.mozilla.com/D17380
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/ssl.gyp10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/ssl/ssl.gyp b/lib/ssl/ssl.gyp
index 235f752d5..7c89d80c1 100644
--- a/lib/ssl/ssl.gyp
+++ b/lib/ssl/ssl.gyp
@@ -74,6 +74,11 @@
'-std=gnu99',
],
}],
+ [ 'enable_sslkeylogfile==1', {
+ 'defines': [
+ 'NSS_ALLOW_SSLKEYLOGFILE',
+ ],
+ }],
],
'dependencies': [
'<(DEPTH)/exports.gyp:nss_exports',
@@ -93,11 +98,6 @@
}
}
],
- 'target_defaults': {
- 'defines': [
- 'NSS_ALLOW_SSLKEYLOGFILE=1'
- ]
- },
'variables': {
'module': 'nss'
}