From: Nicolas Despres <nicolas.despres@gmail.com>
Date: Wed, 9 Dec 2015 22:18:18 +0000 (+0100)
Subject: Do not attempt to rebuild infinitely in dry-run mode.
X-Git-Tag: upstream/1.7.0^2~33^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=956876408a64135d8448f2f55fc9213003edb40e;p=platform%2Fupstream%2Fninja.git

Do not attempt to rebuild infinitely in dry-run mode.
---

diff --git a/src/ninja.cc b/src/ninja.cc
index 21dede6..a73f83c 100644
--- a/src/ninja.cc
+++ b/src/ninja.cc
@@ -1135,6 +1135,10 @@ int real_main(int argc, char** argv) {
 
     // Attempt to rebuild the manifest before building anything else
     if (ninja.RebuildManifest(options.input_file, &err)) {
+      // In dry_run mode the regeneration will succeed without changing the
+      // manifest forever. Better to return immediately.
+      if (config.dry_run)
+        return 0;
       // Start the build over with the new manifest.
       continue;
     } else if (!err.empty()) {