diff options
author | Rich Salz <rsalz@akamai.com> | 2021-08-17 11:42:21 -0400 |
---|---|---|
committer | Pauli <pauli@openssl.org> | 2021-08-20 10:32:35 +1000 |
commit | ecb09bafad43bc8a722c498f859ed6ad3c73b99b (patch) | |
tree | 8471386868b29ac7cc385278f7bbcc27ccda2f64 | |
parent | 214888448df407e2154ca871d6ffec41ab18698e (diff) |
Replace CONFIG_NOWAIT env var with -w option
And document the -w option
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16325)
-rwxr-xr-x | Configure | 4 | ||||
-rw-r--r-- | INSTALL.md | 13 | ||||
-rwxr-xr-x | util/perl/OpenSSL/config.pm | 2 |
3 files changed, 11 insertions, 8 deletions
@@ -63,6 +63,8 @@ EOF # (Default: PREFIX/ssl) # --banner=".." Output specified text instead of default completion banner # +# -w Don't wait after showing a Configure warning +# # --cross-compile-prefix Add specified prefix to binutils components. # # --api One of 0.9.8, 1.0.0, 1.0.1, 1.0.2, 1.1.0, 1.1.1, or 3.0 @@ -898,7 +900,7 @@ while (@argvcopy) { $guess_opts{verbose} = 1; } - elsif (/^-w$/) # From older 'config' + elsif (/^-w$/) { $guess_opts{nowait} = 1; } diff --git a/INSTALL.md b/INSTALL.md index f483c0e8a0..722a88bf04 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -587,6 +587,13 @@ alternative, you can use the language specific variables, `CFLAGS` and `CXXFLAGS Use the specified text instead of the default banner at the end of configuration. +### --w + +On platforms where the choice of 32-bit or 64-bit architecture +is not explicitly specified, `Configure` will print a warning +message and wait for a few seconds to let you interrupt the +configuration. Using this flag skips the wait. + ### no-bulk Build only some minimal set of features. @@ -1404,12 +1411,6 @@ over the build process. Typically these should be defined prior to running using this variable. Set it to the compiler executable you wish to use, e.g. gcc or clang. - CONFIG_NOWAIT - On platforms where the choice of 32-bit or 64-bit architecture - is not explicitly specified, `Configure` will print a warning - message and wait for a few seconds to let you interrupt the - configuration. Setting this variable will skip the wait. - CROSS_COMPILE This environment variable has the same meaning as for the "--cross-compile-prefix" Configure flag described above. If both diff --git a/util/perl/OpenSSL/config.pm b/util/perl/OpenSSL/config.pm index b6de03c43a..7250791b5b 100755 --- a/util/perl/OpenSSL/config.pm +++ b/util/perl/OpenSSL/config.pm @@ -22,8 +22,8 @@ use Carp; # These control our behavior. my $DRYRUN; my $VERBOSE; -my $WAIT = defined $ENV{'CONFIG_NOWAIT'} ? 0 : 1; my $WHERE = dirname($0); +my $WAIT = 1; # Machine type, etc., used to determine the platform my $MACHINE; |