Skip to content

Commit 5de9bc6

Browse files
committed
build: add node_use_openssl check to install.py
When configuring --without-ssl and then running make install openssl headers will be copied from deps/openssl to the target installation directory. This commit adds a check for is node_use_openssl is set in which case the headers are not copied.
1 parent b98004b commit 5de9bc6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

configure

-1
Original file line numberDiff line numberDiff line change
@@ -975,7 +975,6 @@ def configure_openssl(o):
975975
else:
976976
o['variables']['openssl_fips'] = ''
977977

978-
979978
if options.without_ssl:
980979
return
981980
configure_library('openssl', o)

tools/install.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,8 @@ def headers(action):
165165
if 'false' == variables.get('node_shared_libuv'):
166166
subdir_files('deps/uv/include', 'include/node/', action)
167167

168-
if 'false' == variables.get('node_shared_openssl'):
168+
if 'true' == variables.get('node_use_openssl') and \
169+
'false' == variables.get('node_shared_openssl'):
169170
subdir_files('deps/openssl/openssl/include/openssl', 'include/node/openssl/', action)
170171
subdir_files('deps/openssl/config/archs', 'include/node/openssl/archs', action)
171172
action(['deps/openssl/config/opensslconf.h'], 'include/node/openssl/')

0 commit comments

Comments
 (0)