Module: wine Branch: master Commit: b070eb78cc1e9684f841317f1126e47d09ed0f99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b070eb78cc1e9684f841317f1...
Author: Jacek Caban jacek@codeweavers.com Date: Mon May 17 18:41:56 2021 +0200
configure: Try using pure clang as a cross compiler when mingw is not available.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
aclocal.m4 | 8 ++++---- configure | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4 index bd8ca6b33e5..52b7efc5a03 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -218,18 +218,18 @@ dnl AC_DEFUN([WINE_CHECK_MINGW_PROG], [case "$host_cpu" in aarch64*) - ac_prefix_list="aarch64-w64-mingw32-clang aarch64-w64-mingw32-gcc" ;; + ac_prefix_list="aarch64-w64-mingw32-clang aarch64-w64-mingw32-gcc clang" ;; arm*) - ac_prefix_list="armv7-w64-mingw32-clang armv7-w64-mingw32-gcc" ;; + ac_prefix_list="armv7-w64-mingw32-clang armv7-w64-mingw32-gcc clang" ;; i[[3456789]]86*) ac_prefix_list="m4_foreach([ac_wine_prefix],[w64-mingw32, pc-mingw32, mingw32msvc, mingw32], m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-gcc ])) m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-w64-mingw32-clang ]) - mingw32-gcc" ;; + mingw32-gcc clang" ;; x86_64) ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, w64-mingw32, mingw32msvc], m4_foreach([ac_wine_cpu],[x86_64,amd64],[ac_wine_cpu-ac_wine_prefix-gcc ])) - m4_foreach([ac_wine_cpu],[x86_64,amd64],[ac_wine_cpu-w64-mingw32-clang ])" ;; + m4_foreach([ac_wine_cpu],[x86_64,amd64],[ac_wine_cpu-w64-mingw32-clang ]) clang" ;; *) ac_prefix_list="" ;; esac diff --git a/configure b/configure index 7c2e31de5af..ac738ca964b 100755 --- a/configure +++ b/configure @@ -9660,16 +9660,16 @@ then case "x$with_mingw" in x|xyes) case "$host_cpu" in aarch64*) - ac_prefix_list="aarch64-w64-mingw32-clang aarch64-w64-mingw32-gcc" ;; + ac_prefix_list="aarch64-w64-mingw32-clang aarch64-w64-mingw32-gcc clang" ;; arm*) - ac_prefix_list="armv7-w64-mingw32-clang armv7-w64-mingw32-gcc" ;; + ac_prefix_list="armv7-w64-mingw32-clang armv7-w64-mingw32-gcc clang" ;; i[3456789]86*) ac_prefix_list="i686-w64-mingw32-gcc i586-w64-mingw32-gcc i486-w64-mingw32-gcc i386-w64-mingw32-gcc i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc i686-w64-mingw32-clang i586-w64-mingw32-clang i486-w64-mingw32-clang i386-w64-mingw32-clang - mingw32-gcc" ;; + mingw32-gcc clang" ;; x86_64) ac_prefix_list="x86_64-pc-mingw32-gcc amd64-pc-mingw32-gcc x86_64-w64-mingw32-gcc amd64-w64-mingw32-gcc x86_64-mingw32msvc-gcc amd64-mingw32msvc-gcc - x86_64-w64-mingw32-clang amd64-w64-mingw32-clang " ;; + x86_64-w64-mingw32-clang amd64-w64-mingw32-clang clang" ;; *) ac_prefix_list="" ;; esac