diff --git a/src/plugins/mcusupport/mcupackage.cpp b/src/plugins/mcusupport/mcupackage.cpp index b0a3699faff..327af9c06b8 100644 --- a/src/plugins/mcusupport/mcupackage.cpp +++ b/src/plugins/mcusupport/mcupackage.cpp @@ -321,9 +321,7 @@ ToolChain *McuToolChainPackage::msvcToolChain(Id language) { ToolChain *toolChain = ToolChainManager::toolChain([language](const ToolChain *t) { const Abi abi = t->targetAbi(); - // TODO: Should Abi::WindowsMsvc2022Flavor be added too? - return (abi.osFlavor() == Abi::WindowsMsvc2017Flavor - || abi.osFlavor() == Abi::WindowsMsvc2019Flavor) + return abi.osFlavor() == Abi::WindowsMsvc2019Flavor && abi.architecture() == Abi::X86Architecture && abi.wordWidth() == 64 && t->typeId() == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID && t->language() == language;