Skip to content

W
wine-winehq
Commit 39b7c069 authored by André Hentschel's avatar André Hentschel Committed by Alexandre Julliard
Browse files
Options

configure: Detect MinGW-w64 Clang cross toolchain.

Signed-off-by: 's avatarAndré Hentschel <nerv@dawncrow.de> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 8ea38973
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 4 deletions
aclocal.m4
View file @ 39b7c069
...@@ -178,10 +178,12 @@ AC_DEFUN([WINE_CHECK_MINGW_PROG], ...@@ -178,10 +178,12 @@ AC_DEFUN([WINE_CHECK_MINGW_PROG],
i[[3456789]]86*) i[[3456789]]86*)
ac_prefix_list="m4_foreach([ac_wine_prefix],[w64-mingw32, pc-mingw32, mingw32msvc, mingw32], 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-ac_wine_prefix-gcc ]))
mingw32-gcc" ;; m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-w64-mingw32-clang ])
mingw32-gcc" ;;
x86_64) x86_64)
ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, w64-mingw32, mingw32msvc], 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-ac_wine_prefix-gcc ]))
m4_foreach([ac_wine_cpu],[x86_64,amd64],[ac_wine_cpu-w64-mingw32-clang ])" ;;
*) *)
ac_prefix_list="" ;; ac_prefix_list="" ;;
esac esac
......
configure
View file @ 39b7c069
...@@ -8766,9 +8766,11 @@ then ...@@ -8766,9 +8766,11 @@ then
case "$host_cpu" in case "$host_cpu" in
i[3456789]86*) 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 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
mingw32-gcc" ;; i686-w64-mingw32-clang i586-w64-mingw32-clang i486-w64-mingw32-clang i386-w64-mingw32-clang
mingw32-gcc" ;;
x86_64) 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 " ;; 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 " ;;
*) *)
ac_prefix_list="" ;; ac_prefix_list="" ;;
esac esac
...@@ -8841,6 +8843,7 @@ $as_echo "yes" >&6; } ...@@ -8841,6 +8843,7 @@ $as_echo "yes" >&6; }
do do
case "$1" in case "$1" in
*-gcc) CROSSTARGET=`expr "$1" : '\(.*\)-gcc'` ;; *-gcc) CROSSTARGET=`expr "$1" : '\(.*\)-gcc'` ;;
*-clang) CROSSTARGET=`expr "$1" : '\(.*\)-clang'` ;;
esac esac
shift shift
done done
......
configure.ac
View file @ 39b7c069
...@@ -958,6 +958,7 @@ then ...@@ -958,6 +958,7 @@ then
do do
case "$1" in case "$1" in
*-gcc) CROSSTARGET=`expr "$1" : '\(.*\)-gcc'` ;; *-gcc) CROSSTARGET=`expr "$1" : '\(.*\)-gcc'` ;;
*-clang) CROSSTARGET=`expr "$1" : '\(.*\)-clang'` ;;
esac esac
shift shift
done], done],
......
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