From 485c49408639c03664521b40882b0c5bc0a7089a Mon Sep 17 00:00:00 2001 From: hlopko Date: Thu, 22 Feb 2018 03:54:10 -0800 Subject: Do not unconditionally add gcc3 as a system include directory for stl Fixes #3507. RELNOTES: None. PiperOrigin-RevId: 186595099 --- src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/main/java/com') 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 a679527857..be411909f5 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 @@ -119,9 +119,6 @@ public class CppHelper { if (ruleContext.getRule().getAttributeDefinition(":stl") != null) { TransitiveInfoCollection stl = ruleContext.getPrerequisite(":stl", Mode.TARGET); if (stl != null) { - // TODO(bazel-team): Clean this up. - ccCompilationInfoBuilder.addSystemIncludeDir( - stl.getLabel().getPackageIdentifier().getPathUnderExecRoot().getRelative("gcc3")); CcCompilationInfo provider = stl.get(CcCompilationInfo.PROVIDER); if (provider == null) { ruleContext.ruleError("Unable to merge the STL '" + stl.getLabel() -- cgit v1.2.3