From: Richard Levitte <levitte@openssl.org>
Date: Mon, 13 Mar 2017 20:25:37 +0000 (+0100)
Subject: Better way to recognise mingw64 in config script
X-Git-Tag: OpenSSL_1_1_1-pre1~2058
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41bee3e8fb749504f21f78dbf3eca85e5b84820b;p=openssl

Better way to recognise mingw64 in config script

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2922)
---

diff --git a/config b/config
index ad788cbf73..c8886de431 100755
--- a/config
+++ b/config
@@ -320,6 +320,15 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
 	echo "${MACHINE}-v11-${SYSTEM}"; 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;
 	;;
@@ -801,8 +810,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
   i[3456]86-*-cygwin) OUT="Cygwin-x86" ;;
   *-*-cygwin) OUT="Cygwin-${MACHINE}" ;;