From: David Naylor <dbn@freebsd.org>
Subject: configure: explicitly set host_cpu for 'amd64'.
Message-Id: <1742951.ZBy2iUYYNS@dragon.local>
Date: Mon, 02 Feb 2015 22:03:19 +0200

This patch is a follow on from patch 108717 (http://source.winehq.org/patches/data/108717).  


In the case of host starting with 'amd64', the host_cpu variable will not be
set to the correct CPU value of 'x86_64'.  Set it explicitly to the correct
value.
---
 configure    | 1 +
 configure.ac | 1 +
 2 files changed, 2 insertions(+)

diff --git a/configure b/configure
index 3c32ef3..9349d40 100755
--- a/configure
+++ b/configure
@@ -4779,6 +4779,7 @@ $as_echo "no" >&6; }
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
       fi
+      host_cpu="x86_64"
       TARGETFLAGS="-m64"
 
     fi
diff --git a/configure.ac b/configure.ac
index ad6d02b..8163d8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,6 +162,7 @@ case $host in
                           [AC_MSG_RESULT([no])
                            AC_MSG_ERROR([You need gcc >= 4.4 to build Wine as 64-bit.])])
       fi
+      host_cpu="x86_64"
       AC_SUBST(TARGETFLAGS,"-m64")
     fi
     ;;
-- 
2.2.2

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQJ8BAABCgBmBQJUz9gIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5NDhFQzUxMUEyN0YwMzAyRTc5OUI1M0FB
RDYzRkE4REQ2QjJEQTU1AAoJEK1j+o3WstpV8ygP/iZqkBQLDsoyu6ZbgetiTC3x
kLFKY6TJlgC+EJI2mp1b3E8n32b/GW56HNMRKiTms7MeKbS3uX4evJ1cfn80G53a
wBqRLm2WbKn/X9zn/9130jWmpClfDSnVJ9S6aUhHoT85sdQIbS/3ScEkLbznvZBA
HFeb4zfpTnA3v1KMWKm6JKhNPPRwxLbAYBfbK13hArkYxkMXOGCVBPK5LixTLsUT
rpcuXTjmYU9PUdgoHjhj7tu1Aus41DHnr8aOY2KL/oYuQLEao3EJ+cBI4NKXgoVI
T9Lecvs9B7TJy5RL6/ceL4ADR+c11aOwITYkRToJ9A14ONWIv9pFNcCi+aP8DwbP
6o30IXRTrCnBVfC0s5TQbSNM6KJ5SOawwH1VRaPLso8buDPH8Ziwod3JBgqs+Y2e
MCwG3Rdmj3+dZ7uYYKuxJnYXb8LCEjDDRr1H5GA4w6OsD5Y5eW5JYR7eK7kC8lN8
enNLjkjomhZ7m7kfR7zYaspt6K1UQbmUZPIvdjNSFSZ+Zu+6zBuTuA/el+V1J+o0
7A9TlbslTjvtA17msd9OCpQiwk6LidV4pFaoUBVYWLStEB0b/aiVzM1obedG6eZj
HlZZ5SYcEUaBzow7FatAZRskwcVGjv0/VeYOi9gudBTKLzOJuYAO5hu1co41NuAo
OYJJ+WEEOizCNcJS8lz9
=B39m
-----END PGP SIGNATURE-----