Add a fake cc_toolchain_config rule for our fake cc_toolchain to point to when Bazel doesn't need C++ toolchain configuration The toolchain configuration rule we are currently relying on will be removed as part of #8546 RELNOTES: None. PiperOrigin-RevId: 262952632
diff --git a/tools/cpp/cc_configure.bzl b/tools/cpp/cc_configure.bzl index de834d6..4643406 100644 --- a/tools/cpp/cc_configure.bzl +++ b/tools/cpp/cc_configure.bzl
@@ -91,15 +91,16 @@ repository_ctx: repository context overriden_tools: dict of tool paths to use instead of autoconfigured tools """ - paths = resolve_labels(repository_ctx, [ - "@bazel_tools//tools/cpp:cc_toolchain_config.bzl", - ]) env = repository_ctx.os.environ cpu_value = get_cpu_value(repository_ctx) if "BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN" in env and env["BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN"] == "1": - repository_ctx.symlink(paths["@bazel_tools//tools/cpp:cc_toolchain_config.bzl"], "cc_toolchain_config.bzl") - repository_ctx.symlink(Label("@bazel_tools//tools/cpp:BUILD.empty"), "BUILD") + paths = resolve_labels(repository_ctx, [ + "@bazel_tools//tools/cpp:BUILD.empty", + "@bazel_tools//tools/cpp:empty_cc_toolchain_config.bzl", + ]) + repository_ctx.symlink(paths["@bazel_tools//tools/cpp:empty_cc_toolchain_config.bzl"], "cc_toolchain_config.bzl") + repository_ctx.symlink(paths("@bazel_tools//tools/cpp:BUILD.empty"), "BUILD") elif cpu_value == "freebsd": paths = resolve_labels(repository_ctx, [ "@bazel_tools//tools/cpp:BUILD.static.freebsd",