Browse Source

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)
master
Rich Salz 1 month ago
committed by Pauli
parent
commit
ecb09bafad
3 changed files with 11 additions and 8 deletions
  1. +3
    -1
      Configure
  2. +7
    -6
      INSTALL.md
  3. +1
    -1
      util/perl/OpenSSL/config.pm

+ 3
- 1
Configure View File

@ -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;
}


+ 7
- 6
INSTALL.md View File

@ -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


+ 1
- 1
util/perl/OpenSSL/config.pm View File

@ -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;


Loading…
Cancel
Save