From 10de74f918e8bab2aac80787c0cde596cdae4cf5 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Tue, 19 Apr 2011 16:09:23 +0200
Subject: [PATCH] Fix autodetection of 32bit-only compilers

... on 64bit platforms.
---
 src/plugins/projectexplorer/gcctoolchain.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index 25578eeb410..f46bf541598 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()) {