crypto/cryptlib.c: make OPENSS_cpuid_setup safe to use as constructor.

[openssl.git] / Configure

diff --git a/Configure b/Configure
index 653d777e7af9c27de78d9f5a12b6c2191a457980..9f728b9242123e671d2374ffad842fc7e1a60d54 100755 (executable)
--- 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 #########################################