diff options
| author |  hlopko <hlopko@google.com> | 2018-02-22 03:54:10 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-22 03:56:11 -0800 |
| commit | 485c49408639c03664521b40882b0c5bc0a7089a (patch) | |
| tree | 96d673e6e89fa27d67dabda12fc4d9df42fe9429 /src/main/java/com | |
| parent | ac650ffa388531b7f2d06b273ed17cf4ae33e99d (diff) | |
Do not unconditionally add gcc3 as a system include directory for stl
Fixes #3507.
RELNOTES: None.
PiperOrigin-RevId: 186595099
Diffstat (limited to 'src/main/java/com')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java | 3 |
1 files changed, 0 insertions, 3 deletions
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() |