diff options
| author | Daniel Teske <daniel.teske@nokia.com> | 2012-09-11 15:59:17 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@nokia.com> | 2012-09-12 16:29:30 +0200 |
| commit | d3c0557444928b8a3b2812622b7d1137f81e05aa (patch) | |
| tree | 1ddbc010b55d969a11b2c30e6a2d32deb8e48b8e /src/plugins/android/androidtoolchain.cpp | |
| parent | f89352d7a87106ffbed9875c74fb3b61ff920029 (diff) | |
| download | qt-creator-d3c0557444928b8a3b2812622b7d1137f81e05aa.tar.gz | |
Make Toolchain::makeCommand return a full path to the make command
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 <orgads@gmail.com>
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Diffstat (limited to 'src/plugins/android/androidtoolchain.cpp')
| -rw-r--r-- | src/plugins/android/androidtoolchain.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
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<Utils::FileName> AndroidToolChain::suggestedMkspecList() const return QList<Utils::FileName>()<< 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) |