Skip to content

Commit

Permalink
build: check without_ssl in warn openssl_no_asm
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
danbev committed Apr 14, 2018
1 parent bd0a690 commit 89cd749
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 89cd749

Please sign in to comment.