From 8a276097c6f16d7963013e5ce2f53946a2ad339f Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Wed, 13 Apr 2011 12:01:54 +0200
Subject: [PATCH] Fix available toolchains for cmake and generic project
 manager

Reviewed-By: hunger
---
 src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp | 5 ++++-
 src/plugins/genericprojectmanager/genericproject.cpp       | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
index 48e233ddb0f..0be018eabd3 100644
--- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
@@ -402,8 +402,11 @@ void CMakeRunPage::initializePage()
 
         m_generatorComboBox->setVisible(true);
         m_generatorComboBox->clear();
+        ProjectExplorer::Abi abi = ProjectExplorer::Abi::hostAbi();
+        abi = ProjectExplorer::Abi(abi.architecture(), abi.os(), ProjectExplorer::Abi::UnknownFlavor,
+                                   abi.binaryFormat(), abi.wordWidth() == 32 ? 32 : 0);
         QList<ProjectExplorer::ToolChain *> tcs =
-                ProjectExplorer::ToolChainManager::instance()->findToolChains(ProjectExplorer::Abi::hostAbi());
+                ProjectExplorer::ToolChainManager::instance()->findToolChains(abi);
         foreach (ProjectExplorer::ToolChain *tc, tcs) {
             ProjectExplorer::Abi targetAbi = tc->targetAbi();
             QVariant tcVariant = qVariantFromValue(static_cast<void *>(tc));
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 9ba93b0e1db..19713331a9c 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -427,7 +427,10 @@ bool GenericProject::fromMap(const QVariantMap &map)
     if (!id.isNull()) {
         setToolChain(toolChainManager->findToolChain(id));
     } else {
-        QList<ToolChain *> tcs = toolChainManager->findToolChains(Abi::hostAbi());
+        ProjectExplorer::Abi abi = ProjectExplorer::Abi::hostAbi();
+        abi = ProjectExplorer::Abi(abi.architecture(), abi.os(),  ProjectExplorer::Abi::UnknownFlavor,
+                                   abi.binaryFormat(), abi.wordWidth() == 32 ? 32 : 0);
+        QList<ToolChain *> tcs = toolChainManager->findToolChains(abi);
         if (tcs.isEmpty())
             tcs = toolChainManager->toolChains();
         if (!tcs.isEmpty())