Alexandre Julliard : configure: Don' t force a 32-bit build when cross-compiling.
Alexandre Julliard
julliard at winehq.org
Tue Jan 13 10:56:15 CST 2009
Module: wine
Branch: master
Commit: 6b4ed0faae380ffe01bbd98e5d49bd422e34ecbb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b4ed0faae380ffe01bbd98e5d49bd422e34ecbb
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Jan 12 19:29:43 2009 +0100
configure: Don't force a 32-bit build when cross-compiling.
---
configure | 2 +-
configure.ac | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index d42d651..48603ae 100755
--- a/configure
+++ b/configure
@@ -3804,7 +3804,7 @@ fi
case $host in
x86_64*)
- if test "x$enable_win64" != "xyes"
+ if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes"
then
CC="$CC -m32"
CXX="$CXX -m32"
diff --git a/configure.ac b/configure.ac
index d5d8f8e..1a84d69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,7 +101,7 @@ AC_CHECK_TOOL(CPPBIN,cpp,cpp)
case $host in
x86_64*)
- if test "x$enable_win64" != "xyes"
+ if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes"
then
CC="$CC -m32"
CXX="$CXX -m32"
More information about the wine-cvs
mailing list