[openssl-commits] [openssl] master update

[Ben Laurie]

The branch master has been updated
       via  26967dc3e710a69515e477055893a2691f010162 (commit)
      from  d85d3c993e322d3e4c3f00be2910faa8c55b40e3 (commit)


- Log -----------------------------------------------------------------
commit 26967dc3e710a69515e477055893a2691f010162
Author: Ben Laurie <ben at links.org>
Date:   Mon Jan 2 18:13:30 2017 +0000

    Remove annoying and pointless pause.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2167)

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

Summary of changes:
 config | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/config b/config
index 4e7fd10..641d8f5 100755
--- a/config
+++ b/config
@@ -504,16 +504,6 @@ case "$GUESSOS" in
 	    OUT="darwin-i386-cc"
 	fi ;;
   x86_64-apple-darwin*)
-	if [ -z "$KERNEL_BITS" ]; then
-	    echo "WARNING! If you wish to build 32-bit library, then you have to"
-	    echo "         invoke 'KERNEL_BITS=32 $THERE/config $options'."
-	    if [ "$DRYRUN" = "false" -a -t 1 ]; then
-	      echo "         You have about 5 seconds to press Ctrl-C to abort."
-	      # The stty technique used elsewhere doesn't work on
-	      # MacOS. At least, right now on this Mac.
-	      sleep 5
-	    fi
-	fi
 	if [ "$KERNEL_BITS" = "32" ]; then
 	    OUT="darwin-i386-cc"
 	else
@@ -925,4 +915,9 @@ else
   echo "This system ($OUT) is not supported. See file INSTALL for details."
   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
 )