Module: wine Branch: master Commit: 4f68f67cb5d6c88a062220044f15b9cce8b2c418 URL: https://gitlab.winehq.org/wine/wine/-/commit/4f68f67cb5d6c88a062220044f15b9c...
Author: Alexandre Julliard julliard@winehq.org Date: Tue May 14 09:46:58 2024 +0200
configure: Restore warning for missing PE compiler.
It was dropped in cda2886fd3018c9e8c12791238db481b528f6a65.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56665
---
configure | 11 +++++++++++ configure.ac | 3 +++ 2 files changed, 14 insertions(+)
diff --git a/configure b/configure index 0468aea1422..2d1564bfea8 100755 --- a/configure +++ b/configure @@ -12027,6 +12027,17 @@ case $HOST_ARCH in arm|aarch64) test "x$PE_ARCHS" != x || as_fn_error $? "PE cross-compilation is required for $HOST_ARCH, please install clang/llvm-dlltool/lld, or llvm-mingw." "$LINENO" 5 DLLEXT="" ;; + *) + if test "x$PE_ARCHS" = "x" +then : + case "x$with_mingw" in + x) as_fn_append wine_notices "|Suitable PE cross-compiler not found, PE files won't be built." ;; + xno) ;; + *) as_fn_error $? "Suitable PE cross-compiler not found, PE files won't be built. +This is an error since --with-mingw was requested." "$LINENO" 5 ;; +esac + +fi ;; esac
diff --git a/configure.ac b/configure.ac index 31c2fa2588e..71398ef9b29 100644 --- a/configure.ac +++ b/configure.ac @@ -1016,6 +1016,9 @@ case $HOST_ARCH in arm|aarch64) test "x$PE_ARCHS" != x || AC_MSG_ERROR([PE cross-compilation is required for $HOST_ARCH, please install clang/llvm-dlltool/lld, or llvm-mingw.]) DLLEXT="" ;; + *) + WINE_NOTICE_WITH(mingw,[test "x$PE_ARCHS" = "x"], + [Suitable PE cross-compiler not found, PE files won't be built.]) ;; esac
dnl **** External libraries ****