From 2c2a6649c18a6ef2b0ea01f280b7467f35b4c081 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Thu, 9 Mar 2017 10:31:54 +0100 Subject: [PATCH] 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 Reviewed-By: Ben Noordhuis Reviewed-By: Brian White --- tools/install.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/install.py b/tools/install.py index 4f155376eaf534..d1100352c6a413 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/')