Introduce empty "toolchain_category" rule for labels that will be used as
categories of toolchains for the purpose of toolchain selection.
Up to now, we've used the native toolchain_type rule for this purpose. That rule depends on a number of configuration fragments that supply build variables - we don't want toolchains to need to depend on those fragments as well. E.g. toolchain_type depends on JvmConfiguration, but we would like toolchains to work with --experimental_disable_jvm.
PiperOrigin-RevId: 168577759
diff --git a/tools/cpp/BUILD.static b/tools/cpp/BUILD.static
index aaadc5b..d948039 100644
--- a/tools/cpp/BUILD.static
+++ b/tools/cpp/BUILD.static
@@ -116,7 +116,9 @@
srcs = ["link_dynamic_library.sh"],
)
-toolchain_type(name = "toolchain_type")
+# The c++ toolchain type
+load("//tools/build_defs/toolchains:toolchain_category.bzl", "toolchain_category")
+toolchain_category(name = "toolchain_category")
# A dummy toolchain is necessary to satisfy toolchain resolution until platforms
# are used in c++ by default.
@@ -124,7 +126,7 @@
toolchain(
name = "dummy_cc_toolchain",
toolchain = "dummy_cc_toolchain_impl",
- toolchain_type = ":toolchain_type",
+ toolchain_type = ":toolchain_category",
)
load(":dummy_toolchain.bzl", "dummy_toolchain")
