From d24b4a5548c941a7b9bed9888094d9c1be8d6ca3 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Thu, 18 Jul 2013 12:19:02 +0200
Subject: set QT_TARGET_ARCH when building for the host

the built host tool may need to know what the target architecture is,
e.g. mkv8snapshot does.

Change-Id: Ie5b1f6a07fa082d212e7c5b54289de49fd74dbcf
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 configure                        | 1 +
 tools/configure/configureapp.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/configure b/configure
index 2f64fa9c18..43bbe6668b 100755
--- a/configure
+++ b/configure
@@ -6524,6 +6524,7 @@ cat >>"$QTCONFIG.tmp" <<EOF
 CONFIG += $QTCONFIG_CONFIG
 host_build {
     QT_ARCH = $CFG_HOST_ARCH
+    QT_TARGET_ARCH = $CFG_ARCH
 } else {
     QT_ARCH = $CFG_ARCH
     QMAKE_DEFAULT_LIBDIRS = $DEFAULT_LIBDIRS
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index c836e0e851..52348a9c41 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3120,6 +3120,7 @@ void Configure::generateQConfigPri()
         configStream << endl;
         configStream << "host_build {" << endl;
         configStream << "    QT_ARCH = " << dictionary["QT_HOST_ARCH"] << endl;
+        configStream << "    QT_TARGET_ARCH = " << dictionary["QT_ARCH"] << endl;
         configStream << "} else {" << endl;
         configStream << "    QT_ARCH = " << dictionary["QT_ARCH"] << endl;
         if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
-- 
cgit v1.2.3