Skip to content

Commit fe464a2

Browse files
rypiscisaureus
authored andcommitted
Rename GYP variable node_use_system_openssl to be consistent
1 parent 1d3d02c commit fe464a2

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ def configure_openssl(o):
340340
o['defines'] += ['OPENSSL_NO_SSL2=1']
341341

342342
if not options.openssl_use_sys:
343-
o['variables']['node_use_system_openssl'] = b(False)
343+
o['variables']['node_shared_openssl'] = b(False)
344344
else:
345345
out = pkg_config('openssl')
346346
(libs, cflags) = out if out else ('', '')
@@ -355,7 +355,7 @@ def configure_openssl(o):
355355
else:
356356
o['cflags'] += cflags.split()
357357

358-
o['variables']['node_use_system_openssl'] = b(
358+
o['variables']['node_shared_openssl'] = b(
359359
libs or cflags or options.openssl_libpath or options.openssl_includes)
360360

361361

doc/api/process.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ An example of the possible output looks like:
295295
node_shared_zlib: 'false',
296296
node_use_dtrace: 'false',
297297
node_use_openssl: 'true',
298-
node_use_system_openssl: 'false',
298+
node_shared_openssl: 'false',
299299
strict_aliasing: 'true',
300300
target_arch: 'x64',
301301
v8_use_snapshot: 'true' } }

node.gyp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
'node_shared_v8%': 'false',
1010
'node_shared_zlib%': 'false',
1111
'node_use_openssl%': 'true',
12-
'node_use_system_openssl%': 'false',
12+
'node_shared_openssl%': 'false',
1313
'library_files': [
1414
'src/node.js',
1515
'lib/_debugger.js',
@@ -136,7 +136,7 @@
136136
'defines': [ 'HAVE_OPENSSL=1' ],
137137
'sources': [ 'src/node_crypto.cc' ],
138138
'conditions': [
139-
[ 'node_use_system_openssl=="false"', {
139+
[ 'node_shared_openssl=="false"', {
140140
'dependencies': [ './deps/openssl/openssl.gyp:openssl' ],
141141
}]]
142142
}, {

0 commit comments

Comments
 (0)