diff options
author | Evan Martin <martine@danga.com> | 2012-07-28 20:28:56 (GMT) |
---|---|---|
committer | Evan Martin <martine@danga.com> | 2012-07-28 20:28:56 (GMT) |
commit | 0f56b0e5ebe20eccefe064875d15acb3b9378e2a (patch) | |
tree | a7065dad2c3c62c283c2287bc1068e2a2f522221 | |
parent | 48bd2f2b997b26ac187757a65936619969d15ddb (diff) | |
download | Ninja-0f56b0e5ebe20eccefe064875d15acb3b9378e2a.zip Ninja-0f56b0e5ebe20eccefe064875d15acb3b9378e2a.tar.gz Ninja-0f56b0e5ebe20eccefe064875d15acb3b9378e2a.tar.bz2 |
note that -l doesn't work on windows
Filed issue #386 about it too.
-rw-r--r-- | src/ninja.cc | 3 | ||||
-rw-r--r-- | src/util.cc | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ninja.cc b/src/ninja.cc index 538d0d7..7929e68 100644 --- a/src/ninja.cc +++ b/src/ninja.cc @@ -91,6 +91,9 @@ void Usage(const BuildConfig& config) { "\n" " -j N run N jobs in parallel [default=%d]\n" " -l N do not start new jobs if the load average is greater than N\n" +#ifdef _WIN32 +" (not yet implemented on Windows)\n" +#endif " -k N keep going until N jobs fail [default=1]\n" " -n dry run (don't run commands but pretend they succeeded)\n" " -v show all command lines while building\n" diff --git a/src/util.cc b/src/util.cc index 2277a82..10c9dc6 100644 --- a/src/util.cc +++ b/src/util.cc @@ -286,6 +286,7 @@ string StripAnsiEscapeCodes(const string& in) { #ifdef _WIN32 double GetLoadAverage() { // TODO(nicolas.despres@gmail.com): Find a way to implement it on Windows. + // Remember to also update Usage() when this is fixed. return -0.0f; } #else |