Alexandre Julliard : configure: Force -m32 option on x86_64 even if CC is already defined.
Alexandre Julliard
julliard at winehq.org
Mon Oct 20 08:00:24 CDT 2008
Module: wine
Branch: master
Commit: 0607637162fcb7eba260efda5a98a4be716acecd
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0607637162fcb7eba260efda5a98a4be716acecd
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Oct 20 11:37:08 2008 +0200
configure: Force -m32 option on x86_64 even if CC is already defined.
---
configure | 8 ++++----
configure.ac | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/configure b/configure
index 119c985..dd5be9f 100755
--- a/configure
+++ b/configure
@@ -2225,10 +2225,10 @@ case $host in
x86_64*linux*)
if test "x$enable_win64" != "xyes"
then
- test -n "$CC" || CC="gcc -m32"
- test -n "$CXX"|| CXX="g++ -m32"
- test -n "$LD" || LD="ld -m elf_i386"
- test -n "$AS" || AS="as --32"
+ CC="${CC:-gcc} -m32"
+ CXX="${CXX:-g++} -m32"
+ LD="${LD:-ld} -m elf_i386"
+ AS="${AS:-as} --32"
host_cpu="i386"
fi
;;
diff --git a/configure.ac b/configure.ac
index 91850de..0bbe496 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,10 +84,10 @@ case $host in
x86_64*linux*)
if test "x$enable_win64" != "xyes"
then
- test -n "$CC" || CC="gcc -m32"
- test -n "$CXX"|| CXX="g++ -m32"
- test -n "$LD" || LD="ld -m elf_i386"
- test -n "$AS" || AS="as --32"
+ CC="${CC:-gcc} -m32"
+ CXX="${CXX:-g++} -m32"
+ LD="${LD:-ld} -m elf_i386"
+ AS="${AS:-as} --32"
host_cpu="i386"
fi
;;
More information about the wine-cvs
mailing list