From 5add218181ebff630a833077141bf602f09ea057 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 22 Jul 2019 16:12:21 +0200 Subject: [PATCH] ProjectExplorer: Fix using clang on Windows We need to derive some ABI-related data from the parent toolchain. Otherwise, build systems that do not ignore the kit settings will not work. Task-number: QTCREATORBUG-22738 Change-Id: I4359143b4eade124b52af297d7509b682a5852b8 Reviewed-by: hjk --- src/plugins/projectexplorer/gcctoolchain.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 66db003212d..9515668afa3 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -1327,6 +1327,8 @@ WarningFlags ClangToolChain::warningFlags(const QStringList &cflags) const QStringList ClangToolChain::suggestedMkspecList() const { + if (const ToolChain * const parentTc = ToolChainManager::findToolChain(m_parentToolChainId)) + return parentTc->suggestedMkspecList(); const Abi abi = targetAbi(); if (abi.os() == Abi::DarwinOS) return {"macx-clang", "macx-clang-32", "unsupported/macx-clang", "macx-ios-clang"}; @@ -1560,6 +1562,8 @@ void ClangToolChainConfigWidget::applyImpl() for (const ToolChain *mingwTC : mingwToolChains()) { if (parentId == mingwTC->id()) { tc->m_parentToolChainId = mingwTC->id(); + tc->setTargetAbi(mingwTC->targetAbi()); + tc->setSupportedAbis(mingwTC->supportedAbis()); break; } }