From d3c0557444928b8a3b2812622b7d1137f81e05aa Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Tue, 11 Sep 2012 15:59:17 +0200 Subject: Make Toolchain::makeCommand return a full path to the make command MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Requires passing in the environment to use. Also now the mingw toolchain has a fall back to make.exe on windows. And the msvc toolchain falls back to nmake even if the "use Jom" option is used. Task-number: QTCREATORBUG-7831 Change-Id: I850a96da41a380eef8c6992e27a72fb63958c456 Reviewed-by: Orgad Shaneh Reviewed-by: Peter Kümmel --- src/plugins/android/androidtoolchain.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/plugins/android/androidtoolchain.cpp') diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp index c0f59adf29..faa5148b1c 100644 --- a/src/plugins/android/androidtoolchain.cpp +++ b/src/plugins/android/androidtoolchain.cpp @@ -152,13 +152,15 @@ QList AndroidToolChain::suggestedMkspecList() const return QList()<< Utils::FileName::fromString(QLatin1String("android-g++")); } -QString AndroidToolChain::makeCommand() const +QString AndroidToolChain::makeCommand(const Utils::Environment &env) const { #if defined(Q_OS_WIN) - return QLatin1String("ma-make.exe"); + QString make = QLatin1String("ma-make.exe"); #else - return QLatin1String("make"); + QString make = QLatin1String("make"); #endif + QString tmp = env.searchInPath(make); + return tmp.isEmpty() ? make : tmp; } void AndroidToolChain::setQtVersionId(int id) -- cgit v1.2.1