1
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-23 12:05:11 -07:00

Keep IA-32 asm on MingW/Cygwin, check for Windows during the x86-64 test.

This commit is contained in:
Frank Denis 2014-08-04 16:24:11 -07:00
parent b9be5fbd45
commit 2b0c8e40aa

View File

@ -70,8 +70,6 @@ AS_IF([test "x$EMSCRIPTEN" != "x"],[
AC_MSG_WARN([compiling to javascript - asm implementations disabled])
])
AS_CASE([$host], [x86_64-*-mingw*|x86_64-*-cygwin*|x86_64-*-msys], [enable_asm="no"])
AC_ARG_ENABLE(pie,
[AS_HELP_STRING(--disable-pie,Do not produce position independent executables)],
enable_pie=$enableval, enable_pie="maybe")
@ -326,6 +324,9 @@ AS_IF([test "$enable_asm" != "no"],[
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
]], [[
#if defined(__amd64) || defined(__amd64__) || defined(__x86_64__)
# if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64)
# error Windows x86_64 calling conventions are not supported yet
# endif
/* neat */
#else
# error !amd64