diff options
| author |  lpino <lpino@google.com> | 2017-05-09 07:53:35 -0400 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2017-05-09 10:54:48 -0400 |
| commit | 2e62a044b1528c03e79b0a104100c6d5643e37ec (patch) | |
| tree | 5f0395973df7a3a944f9bceff7e57c4dbac2176e | |
| parent | 71c993b9e8cd639663dd8898d6e86fb38dbea8b4 (diff) | |
Exclude the user-provided blazerc from the deduplication process.
PiperOrigin-RevId: 155491277
| -rw-r--r-- | src/main/cpp/option_processor.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/cpp/option_processor.cc b/src/main/cpp/option_processor.cc index 360782ae99..9e750c5e25 100644 --- a/src/main/cpp/option_processor.cc +++ b/src/main/cpp/option_processor.cc @@ -359,10 +359,13 @@ blaze_exit_code::ExitCode OptionProcessor::ParseOptions( if (find_blazerc_exit_code != blaze_exit_code::SUCCESS) { return find_blazerc_exit_code; } - candidate_blazerc_paths.push_back(user_blazerc_path); vector<string> deduped_blazerc_paths = internal::DedupeBlazercPaths(candidate_blazerc_paths); + // TODO(b/37731193): Decide whether the user blazerc should be included in + // the deduplication process. If so then we need to handle all cases + // (e.g. user rc coming from process substitution). + deduped_blazerc_paths.push_back(user_blazerc_path); for (const auto& blazerc_path : deduped_blazerc_paths) { if (!blazerc_path.empty()) { |