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 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(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 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 tcs = toolChainManager->findToolChains(abi); if (tcs.isEmpty()) tcs = toolChainManager->toolChains(); if (!tcs.isEmpty())