Skip to content

Commit 7fd74ab

Browse files
committed
Fix labels
1 parent 55d7d01 commit 7fd74ab

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

bazel/detail/args/target.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ def target_args(name, apple_os_versions, **kwargs):
3030
"@rules_cc//cc/toolchains/actions:link_actions",
3131
],
3232
args = select({
33-
"//platform:{}-config".format(target): ["--target={}".format(target)]
33+
Label("//platform:{}-config".format(target)): ["--target={}".format(target)]
3434
for target in LINUX_TARGETS
3535
} | {
36-
"//platform:{}-apple-{}-config".format(arch, os): ["--target={}-apple-{}{}".format(arch, os, apple_os_versions.get(os, ""))]
36+
Label("//platform:{}-apple-{}-config".format(arch, os)): ["--target={}-apple-{}{}".format(arch, os, apple_os_versions.get(os, ""))]
3737
for arch, os in APPLE_ARCH_OS_COMBINATIONS
3838
}),
3939
**kwargs

bazel/toolchain.bzl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,19 @@ def portable_cc_toolchain(
4545
name = name + "_cc_toolchain",
4646
args = [
4747
name + "_target_args",
48-
"//detail/args:default",
48+
Label("//detail/args:default"),
4949
] + args,
5050
enabled_features = [
5151
"@rules_cc//cc/toolchains/args:experimental_replace_legacy_action_config_features",
5252
] + select({
53-
"//detail/compilation_mode:fastbuild": fastbuild_features,
54-
"//detail/compilation_mode:dbg": dbg_features,
55-
"//detail/compilation_mode:opt": opt_features,
53+
Label("//detail/compilation_mode:fastbuild"): fastbuild_features,
54+
Label("//detail/compilation_mode:dbg"): dbg_features,
55+
Label("//detail/compilation_mode:opt"): opt_features,
5656
}) + enabled_features,
5757
known_features = [
5858
"@rules_cc//cc/toolchains/args:experimental_replace_legacy_action_config_features",
59-
] + FEATURES.keys() + known_features,
60-
tool_map = "//detail/tools",
59+
] + [Label(f) for f in FEATURES.keys()] + known_features,
60+
tool_map = Label("//detail/tools"),
6161
supports_param_files = False, # we use a shell script wrapper to replace placeholder variables, maybe this can support param files in the future
6262
supports_header_parsing = True,
6363
)

0 commit comments

Comments
 (0)