mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-19 19:50:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Configure death handler: instead of printing directly, amend the message

Browse Source 
This is done by calling die again, just make sure to reset the __DIE__
handler first.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6776)
This commit is contained in:
Richard Levitte 2018-07-24 21:46:55 +02:00
parent 88accfe6dc
commit eb807d5383
1 changed files with 6 additions and 3 deletions

9
Configure

@ -2722,16 +2722,19 @@ exit(0);
# Death handler, to print a helpful message in case of failure #######
#
sub death_handler {
die @_ if $^S;
die @_ if $^S; # To prevent the added message in eval blocks
my $build_file = $target{build_file} // "build file";
print STDERR <<"_____";
my @message = ( <<"_____", @_ );
Failure! $build_file wasn't produced.
Please read INSTALL and associated NOTES files. You may also have to look over
your available compiler tool chain or change your configuration.
_____
$orig_death_handler->(@_) if defined $orig_death_handler;
# Dying is terminal, so it's ok to reset the signal handler here.
$SIG{__DIE__} = $orig_death_handler;
die @message;
}
# Configuration file reading #########################################