summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorCorinna Vinschen <vinschen@redhat.com>2016-01-17 16:42:38 +0100
committerRichard Levitte <levitte@openssl.org>2016-01-18 16:16:00 +0100
commita717c110d25e3e3e197f6b8a9228f2601ca9c9af (patch)
tree6ad6e2b0f6195759f69d61be0d74ce3b3490e6c3 /config
parent42b8f1427a8cdf320e51374a5fbfefc74bec0519 (diff)
downloadopenssl-new-a717c110d25e3e3e197f6b8a9228f2601ca9c9af.tar.gz
Fix configuration system to support different architectures on Cygwin.
This patch allows to recognize the architectures supported by Cygwin and to choose the right configuration from there. Drop -march to use default architecture on 32 bit x86. Drop pre-Cygwin-1.3 recognition since it's long gone and there's no valid configuration for this anymore. Signed-off-by: Corinna Vinschen <vinschen@redhat.com> Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'config')
-rwxr-xr-xconfig13
1 files changed, 2 insertions, 11 deletions
diff --git a/config b/config
index 1683f07888..6f8ee91bb1 100755
--- a/config
+++ b/config
@@ -323,15 +323,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
echo "${MACHINE}-whatever-mingw"; exit 0;
;;
CYGWIN*)
- case "$RELEASE" in
- [bB]*|1.0|1.[12].*)
- echo "${MACHINE}-whatever-cygwin_pre1.3"
- ;;
- *)
- echo "${MACHINE}-whatever-cygwin"
- ;;
- esac
- exit 0
+ echo "${MACHINE}-pc-cygwin"; exit 0
;;
vxworks*)
@@ -814,8 +806,7 @@ case "$GUESSOS" in
fi
;;
# these are all covered by the catchall below
- *-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;;
- *-*-cygwin) OUT="Cygwin" ;;
+ *-*-cygwin) OUT="Cygwin-${MACHINE}" ;;
x86pc-*-qnx6) OUT="QNX6-i386" ;;
*-*-qnx6) OUT="QNX6" ;;
x86-*-android|i?86-*-android) OUT="android-x86" ;;