diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-03-13 21:25:37 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-03-13 21:41:20 +0100 |
| commit | 41bee3e8fb749504f21f78dbf3eca85e5b84820b (patch) | |
| tree | af9476a387467be30c4648c2dd52753ec20144f8 /config | |
| parent | poly1305/asm/poly1305-x86_64.pl: add poly1305_blocks_vpmadd52_4x. (diff) | |
| download | openssl-41bee3e8fb749504f21f78dbf3eca85e5b84820b.tar.xz openssl-41bee3e8fb749504f21f78dbf3eca85e5b84820b.zip | |
Better way to recognise mingw64 in config script
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2922)
Diffstat (limited to 'config')
| -rwxr-xr-x | config | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -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}" ;; |