[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Mon Mar 13 20:41:25 UTC 2017
The branch master has been updated
via 41bee3e8fb749504f21f78dbf3eca85e5b84820b (commit)
from c2b935904a3887f99c452cc120f7e8f2cc7ab33f (commit)
- Log -----------------------------------------------------------------
commit 41bee3e8fb749504f21f78dbf3eca85e5b84820b
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)
-----------------------------------------------------------------------
Summary of changes:
config | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/config b/config
index ad788cb..c8886de 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}" ;;
More information about the openssl-commits
mailing list