Introduce cc_toolchain_type, which exports c++ make variables. Use

//tools/cpp:toolchain_type as the canonical c++ toolchain.

PiperOrigin-RevId: 174759558

1 files changed, 4 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java
index ac85e0741c..2c0bd9e0f6 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java
@@ -233,12 +233,14 @@ public class ConfiguredRuleClassProvider implements RuleClassProvider {
       return this;
     }
 
-    public void addWorkspaceFilePrefix(String contents) {
+    public Builder addWorkspaceFilePrefix(String contents) {
       defaultWorkspaceFilePrefix.append(contents);
+      return this;
     }
 
-    public void addWorkspaceFileSuffix(String contents) {
+    public Builder addWorkspaceFileSuffix(String contents) {
       defaultWorkspaceFileSuffix.append(contents);
+      return this;
     }
 
     public Builder setPrelude(String preludeLabelString) {