feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

MakeStep: Do not require C++ tool chain

Browse Source 
Fall back to C tool chain and then to any other tool chain.

Change-Id: I1683f304a8042cd949f33fcbd4ef18b663e56ea3
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Eike Ziller
2018-05-24 09:37:15 +02:00
parent ae5698fa8e
commit b48742ad40
1 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/plugins/projectexplorer/makestep.cpp
View File

@@ -112,12 +112,35 @@ QString MakeStep::defaultDisplayName()
return tr("Make"); return tr("Make");
} }
static const QList<ToolChain *> preferredToolChains(const Kit *kit)
{
QList<ToolChain *> tcs = ToolChainKitInformation::toolChains(kit);
// prefer CXX, then C, then others
Utils::sort(tcs, [](ToolChain *tcA, ToolChain *tcB) {
if (tcA->language() == tcB->language())
return false;
if (tcA->language() == Constants::CXX_LANGUAGE_ID)
return true;
if (tcB->language() == Constants::CXX_LANGUAGE_ID)
return false;
if (tcA->language() == Constants::C_LANGUAGE_ID)
return true;
return false;
});
return tcs;
}
QString MakeStep::defaultMakeCommand() const QString MakeStep::defaultMakeCommand() const
{ {
BuildConfiguration *bc = buildConfiguration(); BuildConfiguration *bc = buildConfiguration();
ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit(), ProjectExplorer::Constants::CXX_LANGUAGE_ID); if (!bc)
if (bc && tc) return QString();
return tc->makeCommand(environment(bc)); const Utils::Environment env = environment(bc);
for (const ToolChain *tc : preferredToolChains(target()->kit())) {
const QString make = tc->makeCommand(env);
if (!make.isEmpty())
return make;
}
return QString(); return QString();
} }
@@ -141,8 +164,8 @@ Utils::Environment MakeStep::environment(BuildConfiguration *bc) const
Utils::Environment::setupEnglishOutput(&env); Utils::Environment::setupEnglishOutput(&env);
if (makeCommand().isEmpty()) { if (makeCommand().isEmpty()) {
// We also prepend "L" to the MAKEFLAGS, so that nmake / jom are less verbose // We also prepend "L" to the MAKEFLAGS, so that nmake / jom are less verbose
ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit(), const QList<ToolChain *> tcs = preferredToolChains(target()->kit());
ProjectExplorer::Constants::CXX_LANGUAGE_ID); const ToolChain *tc = tcs.isEmpty() ? nullptr : tcs.constFirst();
if (tc && tc->targetAbi().os() == Abi::WindowsOS if (tc && tc->targetAbi().os() == Abi::WindowsOS
&& tc->targetAbi().osFlavor() != Abi::WindowsMSysFlavor) { && tc->targetAbi().osFlavor() != Abi::WindowsMSysFlavor) {
const QString makeFlags = "MAKEFLAGS"; const QString makeFlags = "MAKEFLAGS";