Ken Thomases : configure: On Mac OS X, always specify target architecture to the dev tools.
Alexandre Julliard
julliard at winehq.org
Mon May 4 09:06:37 CDT 2009
Module: wine
Branch: master
Commit: 42664338686f4d5237cefede8e9a0a5cb6011d1d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=42664338686f4d5237cefede8e9a0a5cb6011d1d
Author: Ken Thomases <ken at codeweavers.com>
Date: Fri May 1 22:59:52 2009 -0500
configure: On Mac OS X, always specify target architecture to the dev tools.
Fixes building on Snow Leopard. Mac OS X doesn't have a concept of one
bit-ness being "native". So, which architecture gets built is somewhat
arbitrary. On Snow Leopard, the tools have changed to default to building
64-bit, which causes us problems. So, just always be explicit.
---
configure | 23 +++++++++++++++++++++++
configure.ac | 21 +++++++++++++++++++++
2 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/configure b/configure
index fa8add2..a44b1ca 100755
--- a/configure
+++ b/configure
@@ -3811,6 +3811,29 @@ fi
case $host in
+ *-darwin*)
+ if test "x$enable_win64" == "xyes"
+ then
+ CC="$CC -m64"
+ CXX="$CXX -m64"
+ LD="${LD:-ld} -arch x86_64"
+ AS="${AS:-as} -arch x86_64"
+ host_cpu="x86_64"
+ notice_platform="64-bit "
+ TARGETFLAGS="-m64"
+
+ else
+ CC="$CC -m32"
+ CXX="$CXX -m32"
+ LD="${LD:-ld} -arch i386"
+ AS="${AS:-as} -arch i386"
+ host_cpu="i386"
+ notice_platform="32-bit "
+ TARGETFLAGS="-m32"
+
+ enable_win16=${enable_win16:-yes}
+ fi
+ ;;
x86_64*)
if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes"
then
diff --git a/configure.ac b/configure.ac
index 0d92131..322b6e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,6 +102,27 @@ dnl We can't use AC_PROG_CPP for winegcc, it uses by default $(CC) -E
AC_CHECK_TOOL(CPPBIN,cpp,cpp)
case $host in
+ *-darwin*)
+ if test "x$enable_win64" == "xyes"
+ then
+ CC="$CC -m64"
+ CXX="$CXX -m64"
+ LD="${LD:-ld} -arch x86_64"
+ AS="${AS:-as} -arch x86_64"
+ host_cpu="x86_64"
+ notice_platform="64-bit "
+ AC_SUBST(TARGETFLAGS,"-m64")
+ else
+ CC="$CC -m32"
+ CXX="$CXX -m32"
+ LD="${LD:-ld} -arch i386"
+ AS="${AS:-as} -arch i386"
+ host_cpu="i386"
+ notice_platform="32-bit "
+ AC_SUBST(TARGETFLAGS,"-m32")
+ enable_win16=${enable_win16:-yes}
+ fi
+ ;;
x86_64*)
if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes"
then
More information about the wine-cvs
mailing list