From 89cd74908e870b5f311191d0fb5f97f43bcab886 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Wed, 11 Apr 2018 09:25:29 +0200 Subject: [PATCH] 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 --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index dbf1dfe3214..500994dccac 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