4 files changed, 7 insertions, 12 deletions
diff --git a/src/main/cpp/option_processor.cc b/src/main/cpp/option_processor.cc
index d9a7b2bebe..94d2d3f7f0 100644
--- a/src/main/cpp/option_processor.cc
+++ b/src/main/cpp/option_processor.cc
@@ -259,15 +259,18 @@ std::unique_ptr<CommandLine> OptionProcessor::SplitCommandLine(
 // If no readable .blazerc file is found, return the empty string.
 blaze_exit_code::ExitCode OptionProcessor::FindUserBlazerc(
     const char* cmdLineRcFile,
-    const string& rc_basename,
     const string& workspace,
     string* blaze_rc_file,
     string* error) {
+  const string rc_basename =
+      "." + parsed_startup_options_->GetLowercaseProductName() + "rc";
+
   if (cmdLineRcFile != NULL) {
     string rcFile = MakeAbsolute(cmdLineRcFile);
     if (!blaze_util::CanReadFile(rcFile)) {
       blaze_util::StringPrintf(error,
-          "Error: Unable to read .blazerc file '%s'.", rcFile.c_str());
+          "Error: Unable to read %s file '%s'.", rc_basename.c_str(),
+          rcFile.c_str());
       return blaze_exit_code::BAD_ARGV;
     }
     *blaze_rc_file = rcFile;
@@ -331,8 +334,7 @@ blaze_exit_code::ExitCode OptionProcessor::ParseOptions(
 
   string user_blazerc_path;
   blaze_exit_code::ExitCode find_blazerc_exit_code = FindUserBlazerc(
-      blazerc, workspace_layout_->RcBasename(), workspace, &user_blazerc_path,
-      error);
+      blazerc, workspace, &user_blazerc_path, error);
   if (find_blazerc_exit_code != blaze_exit_code::SUCCESS) {
     return find_blazerc_exit_code;
   }
diff --git a/src/main/cpp/option_processor.h b/src/main/cpp/option_processor.h
index fc6fb33e94..8ea705816a 100644
--- a/src/main/cpp/option_processor.h
+++ b/src/main/cpp/option_processor.h
@@ -102,7 +102,7 @@ class OptionProcessor {
   StartupOptions* GetParsedStartupOptions() const;
 
   virtual blaze_exit_code::ExitCode FindUserBlazerc(
-      const char* cmdLineRcFile, const std::string& rc_basename,
+      const char* cmdLineRcFile,
       const std::string& workspace, std::string* user_blazerc_file,
       std::string* error);
 
diff --git a/src/main/cpp/workspace_layout.cc b/src/main/cpp/workspace_layout.cc
index 7d8f4d7a15..99083d2b7f 100644
--- a/src/main/cpp/workspace_layout.cc
+++ b/src/main/cpp/workspace_layout.cc
@@ -49,10 +49,6 @@ string WorkspaceLayout::GetWorkspace(const string &cwd) const {
   return "";
 }
 
-string WorkspaceLayout::RcBasename() const {
-  return ".bazelrc";
-}
-
 static string FindDepotBlazerc(const blaze::WorkspaceLayout* workspace_layout,
                                const string& workspace) {
   // Package semantics are ignored here, but that's acceptable because
diff --git a/src/main/cpp/workspace_layout.h b/src/main/cpp/workspace_layout.h
index 64c6a985f4..5f5a87691d 100644
--- a/src/main/cpp/workspace_layout.h
+++ b/src/main/cpp/workspace_layout.h
@@ -43,9 +43,6 @@ class WorkspaceLayout {
   // Returns if workspace is a valid build workspace.
   virtual bool InWorkspace(const std::string& workspace) const;
 
-  // Returns the basename for the rc file.
-  virtual std::string RcBasename() const;
-
   // Returns the candidate pathnames for the RC files.
   virtual void FindCandidateBlazercPaths(
       const std::string& workspace,