summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorDaniel Bevenius <daniel.bevenius@gmail.com>2018-04-11 09:25:29 +0200
committerDaniel Bevenius <daniel.bevenius@gmail.com>2018-04-14 13:39:43 +0200
commit89cd74908e870b5f311191d0fb5f97f43bcab886 (patch)
treeffc914d4ddab216745973a0bdfbedad10273572b /configure
parentbd0a690632268789a9c5611e90ea5255265e7cac (diff)
downloadandroid-node-v8-89cd74908e870b5f311191d0fb5f97f43bcab886.tar.gz
android-node-v8-89cd74908e870b5f311191d0fb5f97f43bcab886.tar.bz2
android-node-v8-89cd74908e870b5f311191d0fb5f97f43bcab886.zip
build: check without_ssl in warn openssl_no_asm
Currently when configuring --without-ssl the following warning is displayed: WARNING: openssl_no_asm is enabled due to missed or old assembler. Please refer BUILDING.md This commit adds a check of options.without_ssl to avoid this warning when --without-ssl is used. PR-URL: https://github.com/nodejs/node/pull/19934 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index dbf1dfe321..500994dcca 100755
--- a/configure
+++ b/configure
@@ -1101,7 +1101,8 @@ def configure_openssl(o):
('llvm_version' in variables and variables['llvm_version'] >= '3.3') or \
('nasm_version' in variables and variables['nasm_version'] >= '2.10')
- if not openssl110_asm_supported and variables['openssl_no_asm'] == 0:
+ if not options.without_ssl and not openssl110_asm_supported and \
+ variables['openssl_no_asm'] == 0:
warn('''openssl_no_asm is enabled due to missed or old assembler.
Please refer BUILDING.md''')
variables['openssl_no_asm'] = 1