[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  eb807d5383fd228a5c4cf9afc2fec487e0d22cee (commit)
       via  88accfe6dccf904fec5a17db4a59cd2c4c480382 (commit)
       via  1a6c30029802179ebe0ec1eedfdc9d78bb6dc4dd (commit)
      from  61ac9fc5c44718bf61ab68328333cc158230d090 (commit)


- Log -----------------------------------------------------------------
commit eb807d5383fd228a5c4cf9afc2fec487e0d22cee
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jul 24 21:46:55 2018 +0200

    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 at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6776)

commit 88accfe6dccf904fec5a17db4a59cd2c4c480382
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jul 24 19:29:49 2018 +0200

    Configure death handler: remember to call original death handler
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6776)

commit 1a6c30029802179ebe0ec1eedfdc9d78bb6dc4dd
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jul 24 19:29:06 2018 +0200

    Configure death handler: bail out early when run in eval block
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6776)

-----------------------------------------------------------------------

Summary of changes:
 Configure | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Configure b/Configure
index 653d777..9f728b9 100755
--- a/Configure
+++ b/Configure
@@ -2722,14 +2722,19 @@ exit(0);
 # Death handler, to print a helpful message in case of failure #######
 #
 sub death_handler {
+    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.
 
 _____
+
+    # Dying is terminal, so it's ok to reset the signal handler here.
+    $SIG{__DIE__} = $orig_death_handler;
+    die @message;
 }
 
 # Configuration file reading #########################################