diff options
| author |  ajmichael <ajmichael@google.com> | 2018-01-24 07:43:32 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-24 07:45:06 -0800 |
| commit | 1b3569aec8c823cd88fb9eb03a6b6864951976fe (patch) | |
| tree | d7eb528e31b1ed8bbf09339b08fbfb4af7960ca4 /src/main/cpp/option_processor.cc | |
| parent | f48a935e72ba9497623a5cc2c914d521feb34fcf (diff) | |
Support negated flags in SearchNullaryOption with last-wins semantics.
`blaze --nomaster_bazelrc --master_bazelrc` now uses the master bazelrc.
RELNOTES: None
PiperOrigin-RevId: 183083839
Diffstat (limited to 'src/main/cpp/option_processor.cc')
| -rw-r--r-- | src/main/cpp/option_processor.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/cpp/option_processor.cc b/src/main/cpp/option_processor.cc index 07ea0665c6..4a6e57980b 100644 --- a/src/main/cpp/option_processor.cc +++ b/src/main/cpp/option_processor.cc @@ -327,8 +327,8 @@ blaze_exit_code::ExitCode OptionProcessor::ParseOptions( } bool use_master_blazerc = true; - if (SearchNullaryOption(cmd_line_->startup_args, "--nomaster_blazerc") || - SearchNullaryOption(cmd_line_->startup_args, "--nomaster_bazelrc")) { + if (!SearchNullaryOption(cmd_line_->startup_args, "master_blazerc", true) || + !SearchNullaryOption(cmd_line_->startup_args, "master_bazelrc", true)) { use_master_blazerc = false; } |