Browse Source

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>
v7.x
Daniel Bevenius 8 years ago
committed by Italo A. Casas
parent
commit
542a3735a7
No known key found for this signature in database GPG Key ID: 23EFEFE93C4CFFFE
  1. 3
      tools/install.py

3
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/')

Loading…
Cancel
Save