diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-05-14 12:11:10 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-05-16 13:12:38 +0000 |
| commit | 032dd4a340e9285e231f08d883e8d78cd1f6e0d0 (patch) | |
| tree | 79a64afdd02cad7412505411cfdd0b50bcf7238f /src/plugins/genericprojectmanager/genericmakestep.cpp | |
| parent | 7adbdf050e8f3f806976d8b943a7cf87f0ad9300 (diff) | |
Add effectiveMakeCommand to MakeStep base
Similar to the make step from qmakeprojectmanager.
There is an internal semantic change when there is no C++ toolchain: Now
the effective make command will be empty in that case. Before this patch
it was defaulting to "make", but init() was never using that because it
also checks for an existing C++ toolchain, so there is no visible
change, and actually more consistent now.
Change-Id: I31157fee63c465b4b61701d76152f3ad172c29e8
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/genericprojectmanager/genericmakestep.cpp')
| -rw-r--r-- | src/plugins/genericprojectmanager/genericmakestep.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/genericprojectmanager/genericmakestep.cpp b/src/plugins/genericprojectmanager/genericmakestep.cpp index 739c8211a0..d8d22395f8 100644 --- a/src/plugins/genericprojectmanager/genericmakestep.cpp +++ b/src/plugins/genericprojectmanager/genericmakestep.cpp @@ -71,7 +71,7 @@ bool GenericMakeStep::init(QList<const BuildStep *> &earlierSteps) Utils::Environment env = bc->environment(); Utils::Environment::setupEnglishOutput(&env); pp->setEnvironment(env); - pp->setCommand(makeCommand(bc->environment())); + pp->setCommand(effectiveMakeCommand()); pp->setArguments(allArguments()); pp->resolveAll(); |