summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2017-03-13 21:25:37 +0100
committerRichard Levitte <levitte@openssl.org>2017-03-13 21:42:04 +0100
commit641de7f7874439eb423eb7ace8fec58160cd6e37 (patch)
treea0f9ca5163d46ff935a9bc70421879ed9d007a59 /config
parent7b6c15ef62b8b0e4552f586184f4e90bf07d3c23 (diff)
Better way to recognise mingw64 in config script
Reviewed-by: Andy Polyakov <appro@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2922) (cherry picked from commit 41bee3e8fb749504f21f78dbf3eca85e5b84820b)
Diffstat (limited to 'config')
-rwxr-xr-xconfig11
1 files changed, 9 insertions, 2 deletions
diff --git a/config b/config
index d3e5719625..35e849a958 100755
--- a/config
+++ b/config
@@ -316,6 +316,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;
;;
@@ -806,8 +815,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}" ;;