diff options
author | Jan Niklas Hasse <jhasse@bixense.com> | 2020-01-04 13:31:23 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-04 13:31:23 (GMT) |
commit | 1c5857c37d18a5cf1b7242493c49c6fad02da3a9 (patch) | |
tree | 7ff0e08e4bf2e74626a05492b408995c2543a4a1 /src/ninja.cc | |
parent | 23a628f3c88a085cf3f98776f438cda9041e3209 (diff) | |
parent | ebbb9e2fdb0746e2125013e29a334efc8c0331b6 (diff) | |
download | Ninja-1c5857c37d18a5cf1b7242493c49c6fad02da3a9.zip Ninja-1c5857c37d18a5cf1b7242493c49c6fad02da3a9.tar.gz Ninja-1c5857c37d18a5cf1b7242493c49c6fad02da3a9.tar.bz2 |
Merge pull request #1534 from mathstuf/remove-depslog-restriction
manifest_parser: remove multi-output depslog restriction
Diffstat (limited to 'src/ninja.cc')
-rw-r--r-- | src/ninja.cc | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/ninja.cc b/src/ninja.cc index 0c90e74..bf97b4a 100644 --- a/src/ninja.cc +++ b/src/ninja.cc @@ -74,10 +74,6 @@ struct Options { /// Whether phony cycles should warn or print an error. bool phony_cycle_should_err; - - /// Whether a depfile with multiple targets on separate lines should - /// warn or print an error. - bool depfile_distinct_target_lines_should_err; }; /// The Ninja main() loads up a series of data structures; various tools need @@ -1035,7 +1031,6 @@ bool WarningEnable(const string& name, Options* options) { printf("warning flags:\n" " dupbuild={err,warn} multiple build lines for one target\n" " phonycycle={err,warn} phony build statement references itself\n" -" depfilemulti={err,warn} depfile has multiple output paths on separate lines\n" ); return false; } else if (name == "dupbuild=err") { @@ -1050,11 +1045,9 @@ bool WarningEnable(const string& name, Options* options) { } else if (name == "phonycycle=warn") { options->phony_cycle_should_err = false; return true; - } else if (name == "depfilemulti=err") { - options->depfile_distinct_target_lines_should_err = true; - return true; - } else if (name == "depfilemulti=warn") { - options->depfile_distinct_target_lines_should_err = false; + } else if (name == "depfilemulti=err" || + name == "depfilemulti=warn") { + Warning("deprecated warning 'depfilemulti'"); return true; } else { const char* suggestion = @@ -1338,11 +1331,6 @@ NORETURN void real_main(int argc, char** argv) { if (exit_code >= 0) exit(exit_code); - if (options.depfile_distinct_target_lines_should_err) { - config.depfile_parser_options.depfile_distinct_target_lines_action_ = - kDepfileDistinctTargetLinesActionError; - } - if (options.working_dir) { // The formatting of this string, complete with funny quotes, is // so Emacs can properly identify that the cwd has changed for |