diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2011-04-19 16:09:23 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2011-04-19 16:09:23 +0200 |
| commit | 10de74f918e8bab2aac80787c0cde596cdae4cf5 (patch) | |
| tree | b6d4281c5a9302f81164b113402e62ab5536c85a /src/plugins/projectexplorer | |
| parent | e7d4ee10cc5923cc6777f9d45a9aef1307ce8c59 (diff) | |
| download | qt-creator-10de74f918e8bab2aac80787c0cde596cdae4cf5.tar.gz | |
Fix autodetection of 32bit-only compilers
... on 64bit platforms.
Diffstat (limited to 'src/plugins/projectexplorer')
| -rw-r--r-- | src/plugins/projectexplorer/gcctoolchain.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 25578eeb41..f46bf54159 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -531,8 +531,12 @@ QList<ToolChain *> Internal::GccToolChainFactory::autoDetectToolchains(const QSt return result; QList<Abi> abiList = guessGccAbi(compilerPath, systemEnvironment.toStringList()); - if (!abiList.contains(requiredAbi)) - return result; + if (!abiList.contains(requiredAbi)) { + if (requiredAbi.wordWidth() != 64 + || !abiList.contains(Abi(requiredAbi.architecture(), requiredAbi.os(), requiredAbi.osFlavor(), + requiredAbi.binaryFormat(), 32))) + return result; + } QString debuggerPath = ToolChainManager::instance()->defaultDebugger(requiredAbi); // Find the first debugger if (debuggerPath.isEmpty()) { |