diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2015-06-24 15:20:09 +0000 |
|---|---|---|
| committer | Damien Martin-Guillerez <dmarting@google.com> | 2015-06-25 06:47:06 +0000 |
| commit | 50d124bb2819706ca5658fea998f4493b41bb86b (patch) | |
| tree | b1ed728060da2dc08b93404addad0ef829ebd196 /src/main/cpp/option_processor.cc | |
| parent | 4349f9435d0adb5169553d931b71c40b78c7b60a (diff) | |
Support the --[no]master_bazelrc flag
And get rid of usage of "blazerc" flags in our scripts.
--
MOS_MIGRATED_REVID=96776423
Diffstat (limited to 'src/main/cpp/option_processor.cc')
| -rw-r--r-- | src/main/cpp/option_processor.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/cpp/option_processor.cc b/src/main/cpp/option_processor.cc index c15b57caac..a46a721cde 100644 --- a/src/main/cpp/option_processor.cc +++ b/src/main/cpp/option_processor.cc @@ -262,7 +262,8 @@ blaze_exit_code::ExitCode OptionProcessor::ParseOptions( blazerc = GetUnaryOption(arg_chr, next_arg_chr, "--bazelrc"); } if (use_master_blazerc && - GetNullaryOption(arg_chr, "--nomaster_blazerc")) { + (GetNullaryOption(arg_chr, "--nomaster_blazerc") || + GetNullaryOption(arg_chr, "--nomaster_bazelrc"))) { use_master_blazerc = false; } } |