Commit 045d2113 authored by Alexandre Julliard's avatar Alexandre Julliard

makefiles: Disable native import libraries on ARM64.

parent 56fe0408
...@@ -11712,12 +11712,12 @@ fi } ...@@ -11712,12 +11712,12 @@ fi }
LDFLAGS=$saved_LDFLAGS LDFLAGS=$saved_LDFLAGS
done done
if test $HOST_ARCH = aarch64 -a "x$PE_ARCHS" = x if test $HOST_ARCH = aarch64
then then
as_fn_error $? "PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw." "$LINENO" 5 test "x$PE_ARCHS" != x || as_fn_error $? "PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw." "$LINENO" 5
fi DLLEXT=""
else
if test "x$PE_ARCHS" = "x" if test "x$PE_ARCHS" = "x"
then : then :
case "x$with_mingw" in case "x$with_mingw" in
x) as_fn_append wine_notices "|MinGW compiler not found, cross-compiling PE files won't be supported." ;; x) as_fn_append wine_notices "|MinGW compiler not found, cross-compiling PE files won't be supported." ;;
...@@ -11727,6 +11727,7 @@ This is an error since --with-mingw was requested." "$LINENO" 5 ;; ...@@ -11727,6 +11727,7 @@ This is an error since --with-mingw was requested." "$LINENO" 5 ;;
esac esac
fi fi
fi
if test "x$with_system_dllpath" != "x" -a -n "$PE_ARCHS" if test "x$with_system_dllpath" != "x" -a -n "$PE_ARCHS"
......
...@@ -994,13 +994,14 @@ do ...@@ -994,13 +994,14 @@ do
LDFLAGS=$saved_LDFLAGS LDFLAGS=$saved_LDFLAGS
done done
if test $HOST_ARCH = aarch64 -a "x$PE_ARCHS" = x if test $HOST_ARCH = aarch64
then then
AC_MSG_ERROR([PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw.]) test "x$PE_ARCHS" != x || AC_MSG_ERROR([PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw.])
fi DLLEXT=""
else
WINE_NOTICE_WITH(mingw,[test "x$PE_ARCHS" = "x"], WINE_NOTICE_WITH(mingw,[test "x$PE_ARCHS" = "x"],
[MinGW compiler not found, cross-compiling PE files won't be supported.]) [MinGW compiler not found, cross-compiling PE files won't be supported.])
fi
dnl **** External libraries **** dnl **** External libraries ****
......
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