[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  4bf3e989fef9268507ba02744e7f71ee5637681c (commit)
      from  03e16083ff526d6d38de519620747aabbfc69b83 (commit)


- Log -----------------------------------------------------------------
commit 4bf3e989fef9268507ba02744e7f71ee5637681c
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Jan 27 08:42:20 2020 +0100

    config: ensure the perl Configure run is the last statement
    
    Running any statement after Configure means we lose its exit code
    
    Fixes #10951
    
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    (Merged from https://github.com/openssl/openssl/pull/10953)

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

Summary of changes:
 config | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/config b/config
index 8a65b0e6e2..2213969f90 100755
--- a/config
+++ b/config
@@ -898,8 +898,12 @@ fi
 
 OUT="$OUT"
 
-$PERL $THERE/Configure LIST | grep "$OUT" > /dev/null
-if [ $? = "0" ]; then
+if [ "$OUT" = "darwin64-x86_64-cc" ]; then
+    echo "WARNING! If you wish to build 32-bit libraries, then you have to"
+    echo "         invoke 'KERNEL_BITS=32 $THERE/config $options'."
+fi
+
+if $PERL $THERE/Configure LIST | grep "$OUT" > /dev/null; then
   if [ "$VERBOSE" = "true" ]; then
     echo /usr/bin/env \
 	 __CNF_CPPDEFINES="'$__CNF_CPPDEFINES'" \
@@ -929,8 +933,5 @@ else
   exit 1
 fi
 
-if [ "$OUT" = "darwin64-x86_64-cc" ]; then
-    echo "WARNING! If you wish to build 32-bit libraries, then you have to"
-    echo "         invoke 'KERNEL_BITS=32 $THERE/config $options'."
-fi
+# Do not add anothing from here on, so we don't lose the Configure exit code
 )