diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-18 12:19:02 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-23 16:30:06 +0200 |
| commit | d24b4a5548c941a7b9bed9888094d9c1be8d6ca3 (patch) | |
| tree | 02672e4af691789070fb4fdce56790f0fab52930 | |
| parent | b625cddcd8251c01aa129583053c2340fc2f4620 (diff) | |
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>
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -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")) { |