ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Check for __builtin_ms_va_list on all x86_64 platforms. 

Signed-off-by: Charles Davis <cdavis5x@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Charles Davis 2016-02-29 01:43:17 -07:00 committed by Alexandre Julliard
parent 1eeec9513c
commit 7d295d381c
2 changed files with 22 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
configure vendored
View File

@ -4965,25 +4965,15 @@ fi
case $host in case $host in
*-darwin*) *-darwin*)
if test "x$enable_win64" = "xyes"
then
CC="$CC -m64"
CXX="$CXX -m64"
host_cpu="x86_64"
notice_platform="64-bit "
TARGETFLAGS="-m64"
else
CC="$CC -m32"
CXX="$CXX -m32"
host_cpu="i386"
notice_platform="32-bit "
TARGETFLAGS="-m32"
enable_win16=${enable_win16:-yes}
fi
with_fontconfig=${with_fontconfig:-no} with_fontconfig=${with_fontconfig:-no}
;; ;;
*-mingw32*|*-cygwin*)
enable_win16=${enable_win16:-no}
CFLAGS="$CFLAGS -D_WIN32"
;;
esac
case $host in
x86_64*|amd64*) x86_64*|amd64*)
if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes"
then then
@ -5040,11 +5030,14 @@ $as_echo "yes" >&6; }
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }
as_fn_error $? "You need gcc >= 4.4 to build Wine as 64-bit." "$LINENO" 5 as_fn_error $? "You need gcc >= 4.4 or clang >= 3.8 to build Wine as 64-bit." "$LINENO" 5
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi fi
CC="$CC -m64"
CXX="$CXX -m64"
host_cpu="x86_64" host_cpu="x86_64"
notice_platform="64-bit "
TARGETFLAGS="-m64" TARGETFLAGS="-m64"
fi fi
@ -5076,10 +5069,6 @@ rm -f core conftest.err conftest.$ac_objext \
CFLAGS="$CFLAGS -marm" CFLAGS="$CFLAGS -marm"
TARGETFLAGS="-marm" TARGETFLAGS="-marm"
;;
*-mingw32*|*-cygwin*)
enable_win16=${enable_win16:-no}
CFLAGS="$CFLAGS -D_WIN32"
;; ;;
i[3456789]86*) i[3456789]86*)
enable_win16=${enable_win16:-yes} enable_win16=${enable_win16:-yes}

31
configure.ac
View File

@ -127,23 +127,15 @@ AC_CHECK_TOOL(LD,ld)
case $host in case $host in
*-darwin*) *-darwin*)
if test "x$enable_win64" = "xyes"
then
CC="$CC -m64"
CXX="$CXX -m64"
host_cpu="x86_64"
notice_platform="64-bit "
AC_SUBST(TARGETFLAGS,"-m64")
else
CC="$CC -m32"
CXX="$CXX -m32"
host_cpu="i386"
notice_platform="32-bit "
AC_SUBST(TARGETFLAGS,"-m32")
enable_win16=${enable_win16:-yes}
fi
with_fontconfig=${with_fontconfig:-no} with_fontconfig=${with_fontconfig:-no}
;; ;;
*-mingw32*|*-cygwin*)
enable_win16=${enable_win16:-no}
CFLAGS="$CFLAGS -D_WIN32"
;;
esac
case $host in
x86_64*|amd64*) x86_64*|amd64*)
if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes"
then then
@ -164,9 +156,12 @@ case $host in
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[void func(__builtin_ms_va_list *args);]])], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[void func(__builtin_ms_va_list *args);]])],
[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no]) [AC_MSG_RESULT([no])
AC_MSG_ERROR([You need gcc >= 4.4 to build Wine as 64-bit.])]) AC_MSG_ERROR([You need gcc >= 4.4 or clang >= 3.8 to build Wine as 64-bit.])])
fi fi
CC="$CC -m64"
CXX="$CXX -m64"
host_cpu="x86_64" host_cpu="x86_64"
notice_platform="64-bit "
AC_SUBST(TARGETFLAGS,"-m64") AC_SUBST(TARGETFLAGS,"-m64")
fi fi
;; ;;
@ -179,10 +174,6 @@ case $host in
CFLAGS="$CFLAGS -marm" CFLAGS="$CFLAGS -marm"
AC_SUBST(TARGETFLAGS,"-marm") AC_SUBST(TARGETFLAGS,"-marm")
;; ;;
*-mingw32*|*-cygwin*)
enable_win16=${enable_win16:-no}
CFLAGS="$CFLAGS -D_WIN32"
;;
i[[3456789]]86*) i[[3456789]]86*)
enable_win16=${enable_win16:-yes} enable_win16=${enable_win16:-yes}
;; ;;