Skip to content

Commit f421fb3

Browse files
danbevjasnell
authored andcommitted
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: #19934 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
1 parent 65bd225 commit f421fb3

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

configure

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1101,7 +1101,8 @@ def configure_openssl(o):
11011101
('llvm_version' in variables and variables['llvm_version'] >= '3.3') or \
11021102
('nasm_version' in variables and variables['nasm_version'] >= '2.10')
11031103

1104-
if not openssl110_asm_supported and variables['openssl_no_asm'] == 0:
1104+
if not options.without_ssl and not openssl110_asm_supported and \
1105+
variables['openssl_no_asm'] == 0:
11051106
warn('''openssl_no_asm is enabled due to missed or old assembler.
11061107
Please refer BUILDING.md''')
11071108
variables['openssl_no_asm'] = 1

0 commit comments

Comments
 (0)