feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Use mingw32-make if ma-make is not found

Browse Source 
Task-number: QTCREATORBUG-9297

Change-Id: I06345bd53fe5672ce7606745e6b19f89379a18db
Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
Daniel Teske
2013-05-13 13:37:31 +02:00
parent 889740a90f
commit 270e0e8d84
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/android/androidtoolchain.cpp
View File

@@ -202,9 +202,17 @@ QList<FileName> AndroidToolChain::suggestedMkspecList() const
QString AndroidToolChain::makeCommand(const Utils::Environment &env) const QString AndroidToolChain::makeCommand(const Utils::Environment &env) const
{ {
QString make = HostOsInfo::isWindowsHost() QStringList extraDirectories = AndroidConfigurations::instance().makeExtraSearchDirectories();
? QLatin1String("ma-make.exe") : QLatin1String("make"); if (HostOsInfo::isWindowsHost()) {
QString tmp = env.searchInPath(make, AndroidConfigurations::instance().makeExtraSearchDirectories()); 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; return tmp.isEmpty() ? make : tmp;
} }