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/projectexplorer/abstractmsvctoolchain.h | |
| 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/projectexplorer/abstractmsvctoolchain.h')
| -rw-r--r-- | src/plugins/projectexplorer/abstractmsvctoolchain.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/abstractmsvctoolchain.h b/src/plugins/projectexplorer/abstractmsvctoolchain.h index f52bee7688..2909750645 100644 --- a/src/plugins/projectexplorer/abstractmsvctoolchain.h +++ b/src/plugins/projectexplorer/abstractmsvctoolchain.h @@ -56,14 +56,13 @@ public: QList<HeaderPath> systemHeaderPaths(const Utils::FileName &sysRoot) const; void addToEnvironment(Utils::Environment &env) const; - QString makeCommand() const; + QString makeCommand(const Utils::Environment &environment) const; Utils::FileName compilerCommand() const; IOutputParser *outputParser() const; bool canClone() const; QString varsBat() const { return m_vcvarsBat; } - static QString findInstalledJom(); bool operator ==(const ToolChain &) const; |