Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
7d295d38
Commit
7d295d38
authored
Feb 29, 2016
by
Charles Davis
Committed by
Alexandre Julliard
Mar 01, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
>
parent
1eeec951
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
42 deletions
+22
-42
configure
configure
+11
-22
configure.ac
configure.ac
+11
-20
No files found.
configure
View file @
7d295d38
...
...
@@ -4965,25 +4965,15 @@ fi
case
$host
in
*
-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
}
;;
*
-mingw32
*
|
*
-cygwin
*
)
enable_win16
=
${
enable_win16
:-
no
}
CFLAGS
=
"
$CFLAGS
-D_WIN32"
;;
esac
case
$host
in
x86_64
*
|
amd64
*
)
if
test
"x
$enable_win64
"
!=
"xyes"
-a
"
$cross_compiling
"
!=
"yes"
then
...
...
@@ -5040,11 +5030,14 @@ $as_echo "yes" >&6; }
else
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result: no"
>
&5
$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
rm
-f
core conftest.err conftest.
$ac_objext
conftest.
$ac_ext
fi
CC
=
"
$CC
-m64"
CXX
=
"
$CXX
-m64"
host_cpu
=
"x86_64"
notice_platform
=
"64-bit "
TARGETFLAGS
=
"-m64"
fi
...
...
@@ -5077,10 +5070,6 @@ rm -f core conftest.err conftest.$ac_objext \
TARGETFLAGS
=
"-marm"
;;
*
-mingw32
*
|
*
-cygwin
*
)
enable_win16
=
${
enable_win16
:-
no
}
CFLAGS
=
"
$CFLAGS
-D_WIN32"
;;
i[3456789]86
*
)
enable_win16
=
${
enable_win16
:-
yes
}
;;
...
...
configure.ac
View file @
7d295d38
...
...
@@ -127,23 +127,15 @@ AC_CHECK_TOOL(LD,ld)
case $host in
*-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}
;;
*-mingw32*|*-cygwin*)
enable_win16=${enable_win16:-no}
CFLAGS="$CFLAGS -D_WIN32"
;;
esac
case $host in
x86_64*|amd64*)
if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes"
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_MSG_RESULT([yes])],
[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
CC="$CC -m64"
CXX="$CXX -m64"
host_cpu="x86_64"
notice_platform="64-bit "
AC_SUBST(TARGETFLAGS,"-m64")
fi
;;
...
...
@@ -179,10 +174,6 @@ case $host in
CFLAGS="$CFLAGS -marm"
AC_SUBST(TARGETFLAGS,"-marm")
;;
*-mingw32*|*-cygwin*)
enable_win16=${enable_win16:-no}
CFLAGS="$CFLAGS -D_WIN32"
;;
i[[3456789]]86*)
enable_win16=${enable_win16:-yes}
;;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment