diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/disk_interface.cc | 3 | ||||
-rw-r--r-- | src/ninja.cc | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/disk_interface.cc b/src/disk_interface.cc index 4b4c4c7..aceb575 100644 --- a/src/disk_interface.cc +++ b/src/disk_interface.cc @@ -195,11 +195,12 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const { return ((int64_t)st.st_mtimespec.tv_sec * 1000000000LL + st.st_mtimespec.tv_nsec); #elif (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700 || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \ - defined(__BIONIC__)) + defined(__BIONIC__) || (defined (__SVR4) && defined (__sun))) // For glibc, see "Timestamp files" in the Notes of http://www.kernel.org/doc/man-pages/online/pages/man2/stat.2.html // newlib, uClibc and musl follow the kernel (or Cygwin) headers and define the right macro values above. // For bsd, see https://github.com/freebsd/freebsd/blob/master/sys/sys/stat.h and similar // For bionic, C and POSIX API is always enabled. + // For solaris, see https://docs.oracle.com/cd/E88353_01/html/E37841/stat-2.html. return (int64_t)st.st_mtim.tv_sec * 1000000000LL + st.st_mtim.tv_nsec; #else return (int64_t)st.st_mtime * 1000000000LL + st.st_mtimensec; diff --git a/src/ninja.cc b/src/ninja.cc index fee9374..245cac1 100644 --- a/src/ninja.cc +++ b/src/ninja.cc @@ -207,7 +207,7 @@ void Usage(const BuildConfig& config) { " -f FILE specify input build file [default=build.ninja]\n" "\n" " -j N run N jobs in parallel [default=%d, derived from CPUs available]\n" -" -k N keep going until N jobs fail [default=1]\n" +" -k N keep going until N jobs fail (0 means infinity) [default=1]\n" " -l N do not start new jobs if the load average is greater than N\n" " -n dry run (don't run commands but act like they succeeded)\n" " -v show all command lines while building\n" @@ -691,6 +691,8 @@ int NinjaMain::ToolCompilationDatabase(const Options* options, int argc, char* a EncodeJSONString((*e)->EvaluateCommand().c_str()); printf("\",\n \"file\": \""); EncodeJSONString((*e)->inputs_[0]->path().c_str()); + printf("\",\n \"output\": \""); + EncodeJSONString((*e)->outputs_[0]->path().c_str()); printf("\"\n }"); first = false; |