Skip to content

W
wine-winehq
Commit fc4f3efb authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

configure: Add detection of Mingw64 for crosstests.

parent 74d63c02
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
aclocal.m4
View file @ fc4f3efb
...@@ -141,7 +141,7 @@ dnl ...@@ -141,7 +141,7 @@ dnl
AC_DEFUN([WINE_CHECK_MINGW_PROG], AC_DEFUN([WINE_CHECK_MINGW_PROG],
[AC_CHECK_PROGS([$1], [AC_CHECK_PROGS([$1],
m4_foreach([ac_wine_prefix], m4_foreach([ac_wine_prefix],
[i586-mingw32msvc, i386-mingw32msvc, i686-mingw32, i586-mingw32, i486-mingw32, i386-mingw32, mingw32, i686-pc-mingw32, mingw], [$host_cpu-pc-mingw32, i586-mingw32msvc, i386-mingw32msvc, i686-mingw32, i586-mingw32, i486-mingw32, i386-mingw32, mingw32, i686-pc-mingw32, mingw],
[ac_wine_prefix-$2 ]), [ac_wine_prefix-$2 ]),
[$3],[$4])]) [$3],[$4])])
......
configure
View file @ fc4f3efb
...@@ -9721,7 +9721,7 @@ fi ...@@ -9721,7 +9721,7 @@ fi
if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll" if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll"
then then
for ac_prog in i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc mingw32-gcc i686-pc-mingw32-gcc mingw-gcc for ac_prog in $host_cpu-pc-mingw32-gcc i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc mingw32-gcc i686-pc-mingw32-gcc mingw-gcc
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
...@@ -9764,7 +9764,7 @@ fi ...@@ -9764,7 +9764,7 @@ fi
done done
test -n "$CROSSCC" || CROSSCC="false" test -n "$CROSSCC" || CROSSCC="false"
for ac_prog in i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i486-mingw32-dlltool i386-mingw32-dlltool mingw32-dlltool i686-pc-mingw32-dlltool mingw-dlltool for ac_prog in $host_cpu-pc-mingw32-dlltool i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i486-mingw32-dlltool i386-mingw32-dlltool mingw32-dlltool i686-pc-mingw32-dlltool mingw-dlltool
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
...@@ -9807,7 +9807,7 @@ fi ...@@ -9807,7 +9807,7 @@ fi
done done
test -n "$DLLTOOL" || DLLTOOL="false" test -n "$DLLTOOL" || DLLTOOL="false"
for ac_prog in i586-mingw32msvc-windres i386-mingw32msvc-windres i686-mingw32-windres i586-mingw32-windres i486-mingw32-windres i386-mingw32-windres mingw32-windres i686-pc-mingw32-windres mingw-windres for ac_prog in $host_cpu-pc-mingw32-windres i586-mingw32msvc-windres i386-mingw32msvc-windres i686-mingw32-windres i586-mingw32-windres i486-mingw32-windres i386-mingw32-windres mingw32-windres i686-pc-mingw32-windres mingw-windres
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
...@@ -9850,7 +9850,7 @@ fi ...@@ -9850,7 +9850,7 @@ fi
done done
test -n "$CROSSWINDRES" || CROSSWINDRES="false" test -n "$CROSSWINDRES" || CROSSWINDRES="false"
for ac_prog in i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i486-mingw32-ar i386-mingw32-ar mingw32-ar i686-pc-mingw32-ar mingw-ar for ac_prog in $host_cpu-pc-mingw32-ar i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i486-mingw32-ar i386-mingw32-ar mingw32-ar i686-pc-mingw32-ar mingw-ar
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
......
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