AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

set QT_TARGET_ARCH when building for the host

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2013-07-18 12:19:02 +02:00 committed by The Qt Project
parent b625cddcd8
commit d24b4a5548
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -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

1
tools/configure/configureapp.cpp
View File

@ -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")) {