diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-07-22 16:12:21 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-07-22 14:49:47 +0000 |
| commit | 5add218181ebff630a833077141bf602f09ea057 (patch) | |
| tree | 6cb37002d17737ce14ec7e4d7f8c65d79d50d861 /src/plugins/projectexplorer/gcctoolchain.cpp | |
| parent | 66b546f34151dd378f4eca9716aff5e077ac0360 (diff) | |
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 <hjk@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/gcctoolchain.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/gcctoolchain.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 66db003212..9515668afa 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; } } |