Expose sysroot as a build variable

This cl removes hardcoded --sysroot flag generation from bazel when constructing
command line for C++ actions. The hardcoded flag is still exposed to Skylark (to
stay backwards compatible).

RELNOTES: None.
PiperOrigin-RevId: 168346711

1 files changed, 1 insertions, 5 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java
index aa9c11edd6..e0fd56322a 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java
@@ -19,7 +19,6 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.Root;
-import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration;
 import com.google.devtools.build.lib.rules.cpp.CompileCommandLine.Builder;
@@ -139,8 +138,6 @@ public class CompileCommandLineTest extends BuildViewTestCase {
   }
 
   private Builder makeCompileCommandLineBuilder() throws Exception {
-    ConfiguredTarget dummyTarget =
-        scratchConfiguredTarget("a", "a", "cc_binary(name='a', srcs=['a.cc'])");
     return CompileCommandLine.builder(
         scratchArtifact("a/FakeInput"),
         scratchArtifact("a/FakeOutput"),
@@ -152,7 +149,6 @@ public class CompileCommandLineTest extends BuildViewTestCase {
         },
         "c++-compile",
         getTargetConfiguration().getFragment(CppConfiguration.class),
-        new DotdFile(scratchArtifact("a/dotD")),
-        CppHelper.getToolchainUsingDefaultCcToolchainAttribute(getRuleContext(dummyTarget)));
+        new DotdFile(scratchArtifact("a/dotD")));
   }
 }