Merge pull request ninja-build#1095 from sgraham/dupbuild-err

Make dupbuild=err work in subninja
mattyork · Jan 27, 2016 · 233acba · 233acba
2 parents 162219a + 902f782
commit 233acba
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 47 deletions.
diff --git a/src/manifest_parser.cc b/src/manifest_parser.cc
@@ -380,7 +380,7 @@ bool ManifestParser::ParseFileInclude(bool new_scope, string* err) {
     return false;
   string path = eval.Evaluate(env_);
 
-  ManifestParser subparser(state_, file_reader_);
+  ManifestParser subparser(state_, file_reader_, dupe_edge_should_err_);
   if (new_scope) {
     subparser.env_ = new BindingEnv(env_);
   } else {

diff --git a/src/manifest_parser.h b/src/manifest_parser.h
@@ -33,7 +33,7 @@ struct ManifestParser {
   };
 
   ManifestParser(State* state, FileReader* file_reader,
-                 bool dupe_edge_should_err = false);
+                 bool dupe_edge_should_err);
 
   /// Load and parse a file.
   bool Load(const string& filename, string* err, Lexer* parent = NULL);