bazel/rules_cc
2
0
Fork 0
mirror of https://github.com/bazelbuild/rules_cc synced 2024-11-27 20:43:26 +00:00
Code Issues Releases Activity

Remove legacy toolchain flags.

Browse source 
BEGIN_PUBLIC
Remove legacy toolchain flags.

This will allow us to enforce that users of the rule based toolchain are not using legacy toolchain resolution, and simplify toolchain creation.
END_PUBLIC

PiperOrigin-RevId: 640017209
Change-Id: I6ea4fad8ddf1a06ad17d706d82e54eb7f05aa6c6
This commit is contained in:
Googler 2024-06-03 21:59:10 -07:00 committed by Copybara-Service
parent 0069837ab5
commit 531c9951a8
2 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cc/toolchains/impl/toolchain_config.bzl
View file

@ -85,12 +85,13 @@ def _cc_toolchain_config_impl(ctx):
# in an error that it expected a string, and for safety's sake, I'd # in an error that it expected a string, and for safety's sake, I'd
# prefer to provide something unique. # prefer to provide something unique.
toolchain_identifier = str(ctx.label), toolchain_identifier = str(ctx.label),
target_system_name = ctx.attr.target_system_name, # These fields are only relevant for legacy toolchain resolution.
target_cpu = ctx.attr.target_cpu, target_system_name = "",
target_libc = ctx.attr.target_libc, target_cpu = "",
compiler = ctx.attr.compiler, target_libc = "",
abi_version = ctx.attr.abi_version, compiler = "",
abi_libc_version = ctx.attr.abi_libc_version, abi_version = "",
abi_libc_version = "",
builtin_sysroot = sysroot, builtin_sysroot = sysroot,
), ),
# This allows us to support all_files. # This allows us to support all_files.
@ -116,15 +117,6 @@ cc_toolchain_config = rule(
# Attributes translated from legacy cc toolchains. # Attributes translated from legacy cc toolchains.
"sysroot": attr.label(providers = [DirectoryInfo]), "sysroot": attr.label(providers = [DirectoryInfo]),
"cxx_builtin_include_directories": attr.label_list(providers = [DirectoryInfo]), "cxx_builtin_include_directories": attr.label_list(providers = [DirectoryInfo]),
# TODO: remove these fields. I'm pretty sure they're unnecessary with
# --incompatible_enable_cc_toolchain_resolution.
"target_system_name": attr.string(),
"target_cpu": attr.string(),
"target_libc": attr.string(),
"compiler": attr.string(mandatory = True),
"abi_version": attr.string(),
"abi_libc_version": attr.string(),
}, },
provides = [ToolchainConfigInfo], provides = [ToolchainConfigInfo],
) )

4
tests/rule_based_toolchain/toolchain_config/BUILD
View file

@ -46,15 +46,11 @@ util.helper_target(
name = "collects_files_toolchain_config", name = "collects_files_toolchain_config",
action_type_configs = [":compile_config"], action_type_configs = [":compile_config"],
args = [":c_compile_args"], args = [":c_compile_args"],
compiler = "gcc-4.1.1",
cxx_builtin_include_directories = [ cxx_builtin_include_directories = [
"//tests/rule_based_toolchain/testdata:directory", "//tests/rule_based_toolchain/testdata:directory",
], ],
skip_experimental_flag_validation_for_test = True, skip_experimental_flag_validation_for_test = True,
sysroot = "//tests/rule_based_toolchain/testdata:directory", sysroot = "//tests/rule_based_toolchain/testdata:directory",
target_cpu = "k8",
target_libc = "glibc-2.2.2",
target_system_name = "local",
toolchain_features = [":compile_feature"], toolchain_features = [":compile_feature"],
) )