From 58debbffe4fa5ff61ced86820ed9bc3fa4fd3cec Mon Sep 17 00:00:00 2001 From: Googler Date: Thu, 12 Sep 2024 17:30:42 -0700 Subject: [PATCH] Remove experimental_enable_rule_based_toolchains flag BEGIN_PUBLIC Remove experimental_enable_rule_based_toolchains flag Rule-based toolchains will not be gated by a flag when released with rules_cc v0.0.10. Also, this flag is unfortunately inherently incompatible with --experimental_exclude_starlark_flags_from_exec_config. END_PUBLIC PiperOrigin-RevId: 674072362 Change-Id: Iebda45d4daf4cec27c48296d61092dc513442911 --- cc/toolchains/BUILD | 7 ------- cc/toolchains/impl/toolchain_config.bzl | 6 ------ tests/rule_based_toolchain/toolchain_config/BUILD | 1 - 3 files changed, 14 deletions(-) diff --git a/cc/toolchains/BUILD b/cc/toolchains/BUILD index 8ae4d977..6c876ba1 100644 --- a/cc/toolchains/BUILD +++ b/cc/toolchains/BUILD @@ -13,16 +13,9 @@ # limitations under the License. load("@bazel_skylib//:bzl_library.bzl", "bzl_library") -load("@bazel_skylib//rules:common_settings.bzl", "bool_flag") load("@bazel_skylib//rules:diff_test.bzl", "diff_test") load("@stardoc//stardoc:stardoc.bzl", "stardoc") -bool_flag( - name = "experimental_enable_rule_based_toolchains", - build_setting_default = False, - visibility = ["//visibility:public"], -) - bzl_library( name = "toolchain_rules", srcs = glob(["*.bzl"]), diff --git a/cc/toolchains/impl/toolchain_config.bzl b/cc/toolchains/impl/toolchain_config.bzl index d4c229ca..da2a8732 100644 --- a/cc/toolchains/impl/toolchain_config.bzl +++ b/cc/toolchains/impl/toolchain_config.bzl @@ -13,7 +13,6 @@ # limitations under the License. """Implementation of the cc_toolchain rule.""" -load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo") load( "//cc/toolchains:cc_toolchain_info.bzl", "ActionTypeSetInfo", @@ -52,9 +51,6 @@ def _cc_toolchain_config_impl(ctx): if ctx.attr.features: fail("Features is a reserved attribute in bazel. Did you mean 'known_features' or 'enabled_features'?") - if not ctx.attr._enabled[BuildSettingInfo].value and not ctx.attr.skip_experimental_flag_validation_for_test: - fail("Rule based toolchains are experimental. To use it, please add --@rules_cc//cc/toolchains:experimental_enable_rule_based_toolchains to your bazelrc") - toolchain_config = toolchain_config_info( label = ctx.label, known_features = ctx.attr.known_features + [ctx.attr._builtin_features], @@ -101,9 +97,7 @@ cc_toolchain_config = rule( "args": attr.label_list(providers = [ArgsListInfo]), "known_features": attr.label_list(providers = [FeatureSetInfo]), "enabled_features": attr.label_list(providers = [FeatureSetInfo]), - "skip_experimental_flag_validation_for_test": attr.bool(default = False), "_builtin_features": attr.label(default = "//cc/toolchains/features:all_builtin_features"), - "_enabled": attr.label(default = "//cc/toolchains:experimental_enable_rule_based_toolchains"), }, provides = [ToolchainConfigInfo], ) diff --git a/tests/rule_based_toolchain/toolchain_config/BUILD b/tests/rule_based_toolchain/toolchain_config/BUILD index 981758ed..b002eff7 100644 --- a/tests/rule_based_toolchain/toolchain_config/BUILD +++ b/tests/rule_based_toolchain/toolchain_config/BUILD @@ -63,7 +63,6 @@ util.helper_target( ], enabled_features = [":simple_feature"], known_features = [":compile_feature"], - skip_experimental_flag_validation_for_test = True, tool_map = ":compile_tool_map", )