[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Richard Levitte]

The branch OpenSSL_1_0_2-stable has been updated
       via  d843779ddf77aec75bcbc4666bc1fdeb9b120fe4 (commit)
      from  7eba15f274f6e241bc3c9077b0427ec39a630e3d (commit)


- Log -----------------------------------------------------------------
commit d843779ddf77aec75bcbc4666bc1fdeb9b120fe4
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Mar 13 21:25:37 2017 +0100

    Better way to recognise mingw64 in config script
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2922)
    (cherry picked from commit 41bee3e8fb749504f21f78dbf3eca85e5b84820b)

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

Summary of changes:
 config | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/config b/config
index 4781bf5..21534e0 100755
--- a/config
+++ b/config
@@ -344,6 +344,15 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
 	echo "mips-sony-newsos4"; exit 0;
 	;;
 
+    # The following combinations are supported
+    # MINGW64* on x86_64 => mingw64
+    # MINGW32* on x86_64 => mingw
+    # MINGW32* on i?86 => mingw
+    #
+    # MINGW64* on i?86 isn't expected to work...
+    MINGW64*:*:*:x86_64)
+	echo "${MACHINE}-whatever-mingw64"; exit 0;
+	;;
     MINGW*)
 	echo "${MACHINE}-whatever-mingw"; exit 0;
 	;;
@@ -848,8 +857,6 @@ case "$GUESSOS" in
 	    options="$options no-asm"
 	fi
 	;;
-  i[3456]86-*-mingw) OUT="mingw" ;;
-  x86_64-*-mingw) OUT="mingw64" ;;
   # these are all covered by the catchall below
   # *-dgux) OUT="dgux" ;;
   mips-sony-newsos4) OUT="newsos4-gcc" ;;