summaryrefslogtreecommitdiffstats
path: root/src/ninja.cc
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2012-08-17 17:25:21 (GMT)
committerEvan Martin <martine@danga.com>2012-08-17 17:35:41 (GMT)
commit697350d1220f50c32043875b49c71c8a294098a4 (patch)
tree970abb9bdef44e79f49423a1cf5646bb8e5743cd /src/ninja.cc
parent413103c4c472410c10da179a841b5e3b05e576c0 (diff)
downloadNinja-697350d1220f50c32043875b49c71c8a294098a4.zip
Ninja-697350d1220f50c32043875b49c71c8a294098a4.tar.gz
Ninja-697350d1220f50c32043875b49c71c8a294098a4.tar.bz2
make it more explicit that a bad build log causes us to rebuild
(Committing this on top of b56fe80 since they're related, but I may end up reverting both.)
Diffstat (limited to 'src/ninja.cc')
-rw-r--r--src/ninja.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ninja.cc b/src/ninja.cc
index 00bd104..19438e5 100644
--- a/src/ninja.cc
+++ b/src/ninja.cc
@@ -759,6 +759,11 @@ reload:
Error("loading build log %s: %s", log_path.c_str(), err.c_str());
return 1;
}
+ if (!err.empty()) {
+ // Hack: Load() can return a warning via err by returning true.
+ Warning("%s", err.c_str());
+ err.clear();
+ }
if (!build_log.OpenForWrite(log_path, &err)) {
Error("opening build log: %s", err.c_str());