From aadc28a9247148eaf030f8829cc980cd6713fabd Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 5 Nov 2020 03:16:11 +0100 Subject: [PATCH] ProjectExplorer: De-duplicate two overrides of ToolChain::makeCommand They originally were identical, but already started diverging. Change-Id: I977f0e54d1ba308bbeddd775ac0e903f6f359234 Reviewed-by: hjk Reviewed-by: Christian Kandeler --- src/plugins/projectexplorer/gcctoolchain.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 1f563b478bf..2efe1baf205 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -1484,7 +1484,7 @@ ClangToolChain::~ClangToolChain() QObject::disconnect(m_mingwToolchainAddedConnection); } -FilePath ClangToolChain::makeCommand(const Environment &environment) const +static FilePath mingwAwareMakeCommand(const Environment &environment) { const QStringList makes = HostOsInfo::isWindowsHost() ? QStringList({"mingw32-make.exe", "make.exe"}) : QStringList({"make"}); @@ -1498,6 +1498,11 @@ FilePath ClangToolChain::makeCommand(const Environment &environment) const return FilePath::fromString(makes.first()); } +FilePath ClangToolChain::makeCommand(const Environment &environment) const +{ + return mingwAwareMakeCommand(environment); +} + /** * @brief Similar to \a GccToolchain::languageExtensions, but recognizes * "-fborland-extensions". @@ -1820,16 +1825,7 @@ QStringList MingwToolChain::suggestedMkspecList() const FilePath MingwToolChain::makeCommand(const Environment &environment) const { - const QStringList makes - = HostOsInfo::isWindowsHost() ? QStringList({"mingw32-make.exe", "make.exe"}) : QStringList({"make"}); - - FilePath tmp; - foreach (const QString &make, makes) { - tmp = environment.searchInPath(make); - if (!tmp.isEmpty()) - return tmp; - } - return FilePath::fromString(makes.first()); + return mingwAwareMakeCommand(environment); } // --------------------------------------------------------------------------