commit 897edaa8ce4c0c4d570d3f279ee96d02604dc5fd
author Googler <ilist@google.com> Mon Dec 18 06:40:41 2023 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Dec 18 06:42:23 2023 -0800
tree fc836ad7d1087233861382fdd22d91f4469a4f9b
parent 4b302c9a9a4617d7755dcca4c268d47da493496f

Automated rollback of commit f4632dfa7753179d84b05e469259057798a2cce3.

*** Reason for rollback ***

Breakages in nightly: []

*** Original change description ***

Remove _cc_toolchain from builtin rules

The attribute is not used, because C++ only uses toolchain resolution.

PiperOrigin-RevId: 591880371
Change-Id: I81674c08db3428da7581de5be5e6a7d6ec442bcd

src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java

diff --git a/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java b/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
index 5fff5eb..49b7511 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
@@ -14,6 +14,8 @@
 
 package com.google.devtools.build.lib.testutil;
 
+import static com.google.devtools.build.lib.rules.cpp.CppRuleClasses.CROSSTOOL_LABEL;
+
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.cmdline.RepositoryName;
 
@@ -152,7 +154,9 @@
 
   /** Partial query to filter out implicit dependencies of C/C++ rules. */
   public static final String CC_DEPENDENCY_CORRECTION =
-      " - deps(" + TOOLS_REPOSITORY + "//tools/cpp:grep-includes)";
+      " - deps(" + TOOLS_REPOSITORY + CROSSTOOL_LABEL + ")"
+      + " - deps(" + TOOLS_REPOSITORY + "//tools/cpp:current_cc_toolchain)"
+      + " - deps(" + TOOLS_REPOSITORY + "//tools/cpp:grep-includes)";
 
   public static final String APPLE_PLATFORM_PATH = "build_bazel_apple_support/platforms";
   public static final String APPLE_PLATFORM_PACKAGE_ROOT = "@build_bazel_apple_support//platforms";