diff options
author | Daniel Bevenius <daniel.bevenius@gmail.com> | 2017-04-03 07:49:59 +0200 |
---|---|---|
committer | Daniel Bevenius <daniel.bevenius@gmail.com> | 2017-04-05 08:27:11 +0200 |
commit | 1f74b9fc3578306edfed214ce5760212b7f7fc3d (patch) | |
tree | e3bb17a9c3df317ec4c1bc6c90766ed80423b8b1 /configure | |
parent | b3db91710b69687addeedb67f81313ab3a5fd1c5 (diff) | |
download | node-new-1f74b9fc3578306edfed214ce5760212b7f7fc3d.tar.gz |
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: https://github.com/nodejs/node/pull/12175
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -977,6 +977,15 @@ def configure_openssl(o): if options.without_ssl: + def without_ssl_error(option): + print('Error: --without-ssl is incompatible with %s' % option) + exit(1) + if options.shared_openssl: + without_ssl_error('--shared-openssl') + if options.openssl_no_asm: + without_ssl_error('--openssl-no-asm') + if options.openssl_fips: + without_ssl_error('--openssl-fips') return configure_library('openssl', o) |