Module: wine Branch: master Commit: 045d211308e7304a39d8ee4ee1f0ec52c2d783b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/045d211308e7304a39d8ee4ee1f0ec5...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Jun 15 10:57:41 2023 +0200
makefiles: Disable native import libraries on ARM64.
---
configure | 11 ++++++----- configure.ac | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/configure b/configure index 3e8b30eb567..93cdaa0a365 100755 --- a/configure +++ b/configure @@ -11712,12 +11712,12 @@ fi } LDFLAGS=$saved_LDFLAGS done
-if test $HOST_ARCH = aarch64 -a "x$PE_ARCHS" = x +if test $HOST_ARCH = aarch64 then - as_fn_error $? "PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw." "$LINENO" 5 -fi - -if test "x$PE_ARCHS" = "x" + 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 + DLLEXT="" +else + if test "x$PE_ARCHS" = "x" then : case "x$with_mingw" in 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 ;; esac
fi +fi
if test "x$with_system_dllpath" != "x" -a -n "$PE_ARCHS" diff --git a/configure.ac b/configure.ac index 1c17475ce80..dd8520f6f48 100644 --- a/configure.ac +++ b/configure.ac @@ -994,13 +994,14 @@ do LDFLAGS=$saved_LDFLAGS done
-if test $HOST_ARCH = aarch64 -a "x$PE_ARCHS" = x +if test $HOST_ARCH = aarch64 then - AC_MSG_ERROR([PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw.]) -fi - -WINE_NOTICE_WITH(mingw,[test "x$PE_ARCHS" = "x"], + test "x$PE_ARCHS" != x || AC_MSG_ERROR([PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw.]) + DLLEXT="" +else + WINE_NOTICE_WITH(mingw,[test "x$PE_ARCHS" = "x"], [MinGW compiler not found, cross-compiling PE files won't be supported.]) +fi
dnl **** External libraries ****