Permalink
Browse files

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 <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Brian White <mscdex@mscdex.net>
  • Loading branch information...
danbev committed Mar 9, 2017
1 parent ea5a2f4 commit 471aa19ffa5f61d3f50fa6566b283c7ee0e9d74a
Showing with 2 additions and 1 deletion.
  1. +2 −1 tools/install.py
View
@@ -165,7 +165,8 @@ def headers(action):
if 'false' == variables.get('node_shared_libuv'):
subdir_files('deps/uv/include', 'include/node/', action)
- if 'false' == variables.get('node_shared_openssl'):
+ if 'true' == variables.get('node_use_openssl') and \
+ 'false' == variables.get('node_shared_openssl'):
subdir_files('deps/openssl/openssl/include/openssl', 'include/node/openssl/', action)
subdir_files('deps/openssl/config/archs', 'include/node/openssl/archs', action)
action(['deps/openssl/config/opensslconf.h'], 'include/node/openssl/')

0 comments on commit 471aa19

Please sign in to comment.