From 1b3569aec8c823cd88fb9eb03a6b6864951976fe Mon Sep 17 00:00:00 2001 From: ajmichael Date: Wed, 24 Jan 2018 07:43:32 -0800 Subject: Support negated flags in SearchNullaryOption with last-wins semantics. `blaze --nomaster_bazelrc --master_bazelrc` now uses the master bazelrc. RELNOTES: None PiperOrigin-RevId: 183083839 --- src/main/cpp/option_processor.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/cpp/option_processor.cc') 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; } -- cgit v1.2.3