From 270e0e8d8474e18a33814b59b8ed710d2a5b6106 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Mon, 13 May 2013 13:37:31 +0200 Subject: Android: Use mingw32-make if ma-make is not found Task-number: QTCREATORBUG-9297 Change-Id: I06345bd53fe5672ce7606745e6b19f89379a18db Reviewed-by: Ray Donnelly Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/plugins/android/androidtoolchain.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp index 65bd22393a..6e3ba77b68 100644 --- a/src/plugins/android/androidtoolchain.cpp +++ b/src/plugins/android/androidtoolchain.cpp @@ -202,9 +202,17 @@ QList AndroidToolChain::suggestedMkspecList() const QString AndroidToolChain::makeCommand(const Utils::Environment &env) const { - QString make = HostOsInfo::isWindowsHost() - ? QLatin1String("ma-make.exe") : QLatin1String("make"); - QString tmp = env.searchInPath(make, AndroidConfigurations::instance().makeExtraSearchDirectories()); + QStringList extraDirectories = AndroidConfigurations::instance().makeExtraSearchDirectories(); + if (HostOsInfo::isWindowsHost()) { + QString tmp = env.searchInPath(QLatin1String("ma-make.exe"), extraDirectories); + if (!tmp.isEmpty()) + return tmp; + tmp = env.searchInPath(QLatin1String("mingw32-make"), extraDirectories); + return tmp.isEmpty() ? QLatin1String("mingw32-make") : tmp; + } + + QString make = QLatin1String("make"); + QString tmp = env.searchInPath(make, extraDirectories); return tmp.isEmpty() ? make : tmp; } -- cgit v1.2.1