diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-02-13 13:43:54 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-25 16:36:54 +0100 |
| commit | 71e9d8bd4b0c5d241fcc3de5e9272a35e7874be0 (patch) | |
| tree | 6ad57da7ba6db6850b0c323dd69747284ec8174a /qmake/generators | |
| parent | b648195c314ab0b342e5883ba13efbdc7104fd9e (diff) | |
fix Windows RT build in amd64 host shell
When running a amd64 VS shell we must not call the x86_amd64
cross-compiler, because it won't be able to start.
Instead we're calling the native amd64 compiler now.
Change-Id: I6968cde3b24c1938b6e0d82f513e49724455f3cc
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index 24465ad152..b588e68e83 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -121,7 +121,11 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t) compiler = QStringLiteral("x86_arm"); compilerArch = QStringLiteral("arm"); } else if (arch == QStringLiteral("x64")) { - compiler = QStringLiteral("x86_amd64"); + const ProStringList hostArch = project->values("QMAKE_TARGET.arch"); + if (hostArch.contains("x86_64")) + compiler = QStringLiteral("amd64"); + else + compiler = QStringLiteral("x86_amd64"); compilerArch = QStringLiteral("amd64"); } else { arch = QStringLiteral("x86"); |