|
19 | 19 | )
|
20 | 20 | load(
|
21 | 21 | "//toolchain/internal:common.bzl",
|
| 22 | + _BZLMOD_ENABLED = "BZLMOD_ENABLED", |
22 | 23 | _arch = "arch",
|
23 | 24 | _canonical_dir_path = "canonical_dir_path",
|
24 | 25 | _check_os_arch_keys = "check_os_arch_keys",
|
|
31 | 32 | _pkg_path_from_label = "pkg_path_from_label",
|
32 | 33 | _supported_targets = "SUPPORTED_TARGETS",
|
33 | 34 | _toolchain_tools = "toolchain_tools",
|
34 |
| - _BZLMOD_ENABLED = "BZLMOD_ENABLED", |
35 | 35 | )
|
36 | 36 | load(
|
37 | 37 | "//toolchain/internal:sysroot.bzl",
|
|
42 | 42 | def _make_string_label(repository, package, target):
|
43 | 43 | return "{prefix}{repo}//{package}:{target}".format(
|
44 | 44 | prefix = "@@" if _BZLMOD_ENABLED else "@",
|
45 |
| - repo = repository, package = package, target = target, |
| 45 | + repo = repository, |
| 46 | + package = package, |
| 47 | + target = target, |
46 | 48 | )
|
47 | 49 |
|
48 | 50 | def llvm_config_impl(rctx):
|
@@ -83,7 +85,7 @@ def llvm_register_toolchains():
|
83 | 85 | # Otherwise, interpret as a key into `toolchain_roots_label_map`:
|
84 | 86 |
|
85 | 87 | # Flip the map (note: no error on duplicate "keys" for now)
|
86 |
| - label_map = { key: label for label, key in rctx.attr.toolchain_roots_label_map.items() } |
| 88 | + label_map = {key: label for label, key in rctx.attr.toolchain_roots_label_map.items()} |
87 | 89 |
|
88 | 90 | if not toolchain_root_val in label_map:
|
89 | 91 | fail(("Value in `toolchain_roots` {key} was interpreted as a `toolchain_roots_label_map` " +
|
@@ -154,7 +156,7 @@ def llvm_register_toolchains():
|
154 | 156 | symlinked_tools_str = ""
|
155 | 157 |
|
156 | 158 | # Flip the sysroot label map (note: no error on duplicate "keys" for now)
|
157 |
| - _sysroot_label_map = { key: label for label, key in rctx.attr.sysroot_label_map.items() } |
| 159 | + _sysroot_label_map = {key: label for label, key in rctx.attr.sysroot_label_map.items()} |
158 | 160 | sysroot_paths_dict, sysroot_labels_dict = _sysroot_paths_dict(
|
159 | 161 | rctx,
|
160 | 162 | rctx.attr.sysroot,
|
|
0 commit comments