Commit 11486a7b authored by Alexandre Julliard's avatar Alexandre Julliard

configure: Require PE cross-compilation for building on ARM64.

There's no -mabi=ms option we could use on ARM64. Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 603130cc
......@@ -6360,34 +6360,6 @@ printf "%s\n" "$wine_cv_float_abi" >&6; }
TARGETFLAGS="$TARGETFLAGS -mfloat-abi=$float_abi"
;;
aarch64*)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports __builtin_ms_va_list" >&5
printf %s "checking whether $CC supports __builtin_ms_va_list... " >&6; }
if test ${wine_cv_builtin_ms_va_list+y}
then :
printf %s "(cached) " >&6
else $as_nop
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
int
main (void)
{
void func(__builtin_ms_va_list *args);
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"
then :
wine_cv_builtin_ms_va_list=yes
else $as_nop
wine_cv_builtin_ms_va_list=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wine_cv_builtin_ms_va_list" >&5
printf "%s\n" "$wine_cv_builtin_ms_va_list" >&6; }
test $wine_cv_builtin_ms_va_list != no || as_fn_error $? "You need clang >= 5.0 to build Wine for arm64." "$LINENO" 5
enable_wow64=${enable_wow64:-yes}
enable_wow64win=${enable_wow64win:-yes}
;;
......@@ -11794,6 +11766,10 @@ esac
fi
case $host_cpu in
aarch64*) test "x$CROSSTARGET" != x || as_fn_error $? "PE cross-compilation is required for ARM64, please install llvm-mingw." "$LINENO" 5 ;;
esac
if test "x$with_system_dllpath" != "x" -a "$CROSSCC" != "false"
then
......
......@@ -193,10 +193,6 @@ case $host in
TARGETFLAGS="$TARGETFLAGS -mfloat-abi=$float_abi"
;;
aarch64*)
AC_CACHE_CHECK([whether $CC supports __builtin_ms_va_list],wine_cv_builtin_ms_va_list,
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[void func(__builtin_ms_va_list *args);]])],
[wine_cv_builtin_ms_va_list=yes],[wine_cv_builtin_ms_va_list=no])])
test $wine_cv_builtin_ms_va_list != no || AC_MSG_ERROR([You need clang >= 5.0 to build Wine for arm64.])
enable_wow64=${enable_wow64:-yes}
enable_wow64win=${enable_wow64win:-yes}
;;
......@@ -995,6 +991,10 @@ fi
WINE_NOTICE_WITH(mingw,[test "x$CROSSTARGET" = "x"],
[MinGW compiler not found, cross-compiling PE files won't be supported.])
case $host_cpu in
aarch64*) test "x$CROSSTARGET" != x || AC_MSG_ERROR([PE cross-compilation is required for ARM64, please install llvm-mingw.]) ;;
esac
dnl **** External libraries ****
if test "x$with_system_dllpath" != "x" -a "$CROSSCC" != "false"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment