Add support for setting CC_FLAGS in cc_toolchain.
Needed to remove cc_flags_supplier and cc_toolchain_alias.
PiperOrigin-RevId: 688983031
Change-Id: Ic7cdb19ce47bfc006476a646023125a1849dba94
diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_toolchain.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_toolchain.bzl
index f152529..5fb1c7d 100644
--- a/src/main/starlark/builtins_bzl/common/cc/cc_toolchain.bzl
+++ b/src/main/starlark/builtins_bzl/common/cc/cc_toolchain.bzl
@@ -14,6 +14,7 @@
"""Starlark implementation of cc_toolchain rule."""
+load(":common/cc/cc_common.bzl", "cc_common")
load(":common/cc/cc_helper.bzl", "cc_helper")
load(":common/cc/cc_toolchain_provider_helper.bzl", "get_cc_toolchain_provider")
load(":common/cc/fdo/fdo_context.bzl", "create_fdo_context")
@@ -133,9 +134,14 @@
cc_toolchain = get_cc_toolchain_provider(ctx, attributes)
if cc_toolchain == None:
fail("This should never happen")
- template_variable_info = TemplateVariableInfo(
- cc_toolchain._additional_make_variables | cc_helper.get_toolchain_global_make_variables(cc_toolchain),
+ feature_configuration = cc_common.configure_features(
+ ctx = ctx,
+ cc_toolchain = cc_toolchain,
+ requested_features = ctx.features,
+ unsupported_features = ctx.disabled_features,
)
+ template_vars = cc_toolchain._additional_make_variables | cc_helper.get_toolchain_global_make_variables(cc_toolchain) | cc_helper.get_cc_flags_make_variable(ctx, feature_configuration, cc_toolchain)
+ template_variable_info = TemplateVariableInfo(template_vars)
toolchain = ToolchainInfo(
cc = cc_toolchain,
# Add a clear signal that this is a CcToolchainProvider, since just "cc" is
