diff options
Diffstat (limited to 'src')
6 files changed, 3 insertions, 43 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 fc36c17f98..800b95ad88 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 @@ -313,10 +313,6 @@ public class BazelCppRuleClasses { very careful, since this may have far-reaching effects. When in doubt, add "-I" flags to <a href="#cc_binary.copts">COPTS</a> instead. </p> - <p>To use <code>-iquote</code> instead of <code>-isystem</code>, specify - <code>--use_isystem_for_includes=false</code> (the flag is undocumented and defaults - to <code>true</code>). - </p> <!-- #END_BLAZE_RULE.ATTRIBUTE -->*/ .add(attr("includes", STRING_LIST)) .add(attr(":lipo_context_collector", LABEL) diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java index 44623f6974..a7b1c3f64b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java @@ -384,23 +384,6 @@ public final class CcCommon { } List<PathFragment> getSystemIncludeDirs() { - // Add in any 'includes' attribute values as relative path fragments - if (!ruleContext.getRule().isAttributeValueExplicitlySpecified("includes") - || !cppConfiguration.useIsystemForIncludes()) { - return ImmutableList.of(); - } - return getIncludeDirsFromIncludesAttribute(); - } - - List<PathFragment> getIncludeDirs() { - if (!ruleContext.getRule().isAttributeValueExplicitlySpecified("includes") - || cppConfiguration.useIsystemForIncludes()) { - return ImmutableList.of(); - } - return getIncludeDirsFromIncludesAttribute(); - } - - private List<PathFragment> getIncludeDirsFromIncludesAttribute() { List<PathFragment> result = new ArrayList<>(); PackageIdentifier packageIdentifier = ruleContext.getLabel().getPackageIdentifier(); PathFragment packageFragment = packageIdentifier.getPathFragment(); diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java index a3ec1d01c0..d4c4da31e6 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java @@ -310,7 +310,6 @@ public final class CcLibraryHelper { .addCopts(common.getCopts()) .addDefines(common.getDefines()) .addDeps(ruleContext.getPrerequisites("deps", Mode.TARGET)) - .addIncludeDirs(common.getIncludeDirs()) .addLooseIncludeDirs(common.getLooseIncludeDirs()) .addPicIndependentObjectFiles(common.getLinkerScripts()) .addSystemIncludeDirs(common.getSystemIncludeDirs()) diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java index 2fc10e733b..319610243b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java @@ -1677,10 +1677,6 @@ public class CppConfiguration extends BuildConfiguration.Fragment { return cppOptions.inmemoryDotdFiles; } - public boolean useIsystemForIncludes() { - return cppOptions.useIsystemForIncludes; - } - public LibcTop getLibcTop() { return cppOptions.libcTop; } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java index 931db76d9a..dd1b3da2a7 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java @@ -541,16 +541,6 @@ public class CppOptions extends FragmentOptions { public boolean inmemoryDotdFiles; @Option( - name = "use_isystem_for_includes", - defaultValue = "true", - category = "undocumented", - help = - "Instruct C and C++ compilations to treat 'includes' paths as system header " - + "paths, by translating it into -isystem instead of -I." - ) - public boolean useIsystemForIncludes; - - @Option( name = "experimental_omitfp", defaultValue = "false", category = "semantics", diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonConfiguredTargetTest.java index f1e11a8d22..464ce57a4d 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonConfiguredTargetTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonConfiguredTargetTest.java @@ -423,8 +423,6 @@ public class CcCommonConfiguredTargetTest extends BuildViewTestCase { // Tests the (immediate) effect of declaring the includes attribute on a // cc_library. - useConfiguration("--use_isystem_for_includes=false"); - scratch.file( "bang/BUILD", "cc_library(name = 'bang',", @@ -434,11 +432,9 @@ public class CcCommonConfiguredTargetTest extends BuildViewTestCase { ConfiguredTarget foo = getConfiguredTarget("//bang:bang"); String includesRoot = "bang/bang_includes"; - List<PathFragment> expected = - ImmutableList.of( - new PathFragment(includesRoot), - targetConfig.getGenfilesFragment().getRelative(includesRoot)); - assertEquals(expected, foo.getProvider(CppCompilationContext.class).getIncludeDirs()); + assertThat(foo.getProvider(CppCompilationContext.class).getSystemIncludeDirs()).containsAllOf( + new PathFragment(includesRoot), + targetConfig.getGenfilesFragment().getRelative(includesRoot)); } @Test |