diff options
author | Ben Boeckel <ben.boeckel@kitware.com> | 2019-03-08 23:39:55 (GMT) |
---|---|---|
committer | Ben Boeckel <ben.boeckel@kitware.com> | 2019-11-20 20:59:48 (GMT) |
commit | 1daa7470ab7ed147726b560d0bc55327fff3482f (patch) | |
tree | e91e5d79f2c003c3f73b8f8c7619399cdfcc8e53 /src/ninja.cc | |
parent | e2433c11d00725913d0b76350f4d35ba749e3f47 (diff) | |
download | Ninja-1daa7470ab7ed147726b560d0bc55327fff3482f.zip Ninja-1daa7470ab7ed147726b560d0bc55327fff3482f.tar.gz Ninja-1daa7470ab7ed147726b560d0bc55327fff3482f.tar.bz2 |
depfile_parser: remove restriction on multiple outputs
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 c24f09d..6dadb44 100644 --- a/src/ninja.cc +++ b/src/ninja.cc @@ -73,10 +73,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 @@ -989,7 +985,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") { @@ -1004,11 +999,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 = @@ -1284,11 +1277,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 |