diff options
| author | Daniel Bevenius <daniel.bevenius@gmail.com> | 2017-03-09 10:31:54 +0100 |
|---|---|---|
| committer | Daniel Bevenius <daniel.bevenius@gmail.com> | 2017-03-13 19:51:26 +0100 |
| commit | 471aa19ffa5f61d3f50fa6566b283c7ee0e9d74a (patch) | |
| tree | 8c3a7cc3064b8874f7405e79d2a5a8b4cfb48177 /tools | |
| parent | ea5a2f4e2b477ae589a22ffc0659e244491c7d05 (diff) | |
| download | android-node-v8-471aa19ffa5f61d3f50fa6566b283c7ee0e9d74a.tar.gz android-node-v8-471aa19ffa5f61d3f50fa6566b283c7ee0e9d74a.tar.bz2 android-node-v8-471aa19ffa5f61d3f50fa6566b283c7ee0e9d74a.zip | |
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: https://github.com/nodejs/node/pull/11766
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Brian White <mscdex@mscdex.net>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/install.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/install.py b/tools/install.py index 4f155376ea..d1100352c6 100755 --- a/tools/install.py +++ b/tools/install.py @@ -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/') |