Skip to content

Commit a703bde

Browse files
danbevitaloacasas
authored andcommitted
build: add checks for openssl configure options
Currently it is possible to configure using --without-ssl and --shared-openssl/--openssl-no-asm/openssl-fips without an error occuring. The commit add check for these combinations: $ ./configure --without-ssl --shared-openssl Error: --without-ssl is incompatible with --shared-openssl $ ./configure --without-ssl --openssl-no-asm Error: --without-ssl is incompatible with --openssl-no-asm $ ./configure --without-ssl --openssl-fips=dummy Error: --without-ssl is incompatible with --openssl-fips PR-URL: #12175 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Richard Lau <[email protected]>
1 parent b495b6a commit a703bde

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

configure

+9
Original file line numberDiff line numberDiff line change
@@ -977,6 +977,15 @@ def configure_openssl(o):
977977

978978

979979
if options.without_ssl:
980+
def without_ssl_error(option):
981+
print('Error: --without-ssl is incompatible with %s' % option)
982+
exit(1)
983+
if options.shared_openssl:
984+
without_ssl_error('--shared-openssl')
985+
if options.openssl_no_asm:
986+
without_ssl_error('--openssl-no-asm')
987+
if options.openssl_fips:
988+
without_ssl_error('--openssl-fips')
980989
return
981990
configure_library('openssl', o)
982991

0 commit comments

Comments
 (0)