From: Richard Levitte <levitte@openssl.org>
Date: Tue, 24 Jul 2018 19:46:55 +0000 (+0200)
Subject: Configure death handler: instead of printing directly, amend the message
X-Git-Tag: OpenSSL_1_1_1-pre9~96
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=eb807d5383fd228a5c4cf9afc2fec487e0d22cee;p=oweals%2Fopenssl.git

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

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

diff --git a/Configure b/Configure
index 8e99f60b97..9f728b9242 100755
--- a/Configure
+++ b/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 #########################################