On Wed, Feb 09, 2005 at 01:38:21PM +0100, Alexandre Julliard wrote:
Alex Woods wine-devel@giblets.org writes:
Changelog:
- configure.ac: Alex Woods wine-devel@giblets.org
Handle host_cpu of x86_64 like other x86s.
This will break the 64-bit build.
Unfortunately, the 64-bit build doesn't seem to build for me at all, but I can see how my previous patch might affect it. Hopefully this one treads on less toes.
Index: configure.ac =================================================================== RCS file: /home/wine/wine/configure.ac,v retrieving revision 1.338 diff -u -p -r1.338 configure.ac --- configure.ac 28 Jan 2005 14:13:08 -0000 1.338 +++ configure.ac 9 Feb 2005 13:39:07 -0000 @@ -42,6 +42,7 @@ fi dnl **** Check for some programs ****
AC_CANONICAL_HOST +build_host_cpu=$host_cpu case $host in x86_64*linux*) if test "x$enable_win64" != "xyes" @@ -49,6 +50,7 @@ case $host in test -n "$CC" || CC="gcc -m32" test -n "$LD" || LD="ld -m elf_i386" test -n "$AS" || AS="as --32" + build_host_cpu="i386" fi ;; esac @@ -977,7 +979,7 @@ case $host_os in AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"]) fi
- case $host_cpu in + case $build_host_cpu in *i[[3456789]]86*) AC_CACHE_CHECK([whether we can relocate the executable to 0x77f00000], ac_cv_ld_reloc_exec, [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x77f00400], @@ -1072,7 +1074,7 @@ esac
case $host_os in linux*) - case $host_cpu in + case $build_host_cpu in *i[[3456789]]86*) AC_SUBST(WINE_BINARIES,"wine-glibc wine-kthread wine-pthread wine-preloader") ;; *) AC_SUBST(WINE_BINARIES,"wine-glibc wine-kthread wine-pthread") ;; esac @@ -1453,7 +1455,7 @@ AC_CHECK_MEMBERS([struct stat.st_blocks]
dnl *** check for the need to define platform-specific symbols
-case $host_cpu in +case $build_host_cpu in *i[[3456789]]86*) WINE_CHECK_DEFINE([__i386__]) ;; *alpha*) WINE_CHECK_DEFINE([__ALPHA__]) ;; *sparc*) WINE_CHECK_DEFINE([__sparc__]) ;;