Skip to content

Commit 542a373

Browse files
danbevitaloacasas
authored andcommitted
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. PR-URL: #11766 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Brian White <[email protected]>
1 parent dd3e6ad commit 542a373

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

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)