Make STL work even when not in the main repository.

This makes all tool dependencies be under @bazel_tools again (and not //tools)

--
MOS_MIGRATED_REVID=107482585

2 files changed, 5 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java
index 7115da9483..32b70795d6 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java
@@ -259,7 +259,8 @@ public class BazelCppRuleClasses {
           so be careful about header files included elsewhere.</p>
           <!-- #END_BLAZE_RULE.ATTRIBUTE -->*/
           .add(attr("copts", STRING_LIST))
-          .add(attr("$stl", LABEL).value(env.getLabel("//tools/cpp:stl")))
+          .add(attr("$stl", LABEL).value(env.getLabel(
+              Constants.TOOLS_REPOSITORY + "//tools/cpp:stl")))
           .add(attr(":stl", LABEL).value(STL))
           .build();
     }
@@ -532,7 +533,7 @@ public class BazelCppRuleClasses {
               // Every cc_rule depends implicitly on STL to make
               // sure that the correct headers are used for inclusion. The only exception is
               // STL itself to avoid cycles in the dependency graph.
-              Label stl = env.getLabel("//tools/cpp:stl");
+              Label stl = env.getLabel(Constants.TOOLS_REPOSITORY + "//tools/cpp:stl");
               return rule.getLabel().equals(stl) ? null : stl;
             }
           }))
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
index 09464b17ed..bcd754bc1c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
@@ -84,7 +84,8 @@ public class CppHelper {
     TransitiveInfoCollection stl = ruleContext.getPrerequisite(":stl", Mode.TARGET);
     if (stl != null) {
       // TODO(bazel-team): Clean this up.
-      contextBuilder.addSystemIncludeDir(stl.getLabel().getPackageFragment().getRelative("gcc3"));
+      contextBuilder.addSystemIncludeDir(
+          stl.getLabel().getPackageIdentifier().getPathFragment().getRelative("gcc3"));
       contextBuilder.mergeDependentContext(stl.getProvider(CppCompilationContext.class));
     }
     CcToolchainProvider toolchain = getToolchain(ruleContext);