Skip to content

Commit af55195

Browse files
committed
Attribute extra_llvm_distributions must be a common attribute.
1 parent 656233d commit af55195

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

toolchain/internal/llvm_distributions.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,7 @@ def _distribution_urls(rctx):
10501050
rctx_host_info = host_info(rctx)
10511051
if is_requirement(llvm_version):
10521052
llvm_version, basename, error = _required_llvm_release_name(
1053-
version_or_requirements = _parse_version_or_requirements(llvm_version),
1053+
version_or_requirements = llvm_version,
10541054
all_llvm_distributions = all_llvm_distributions,
10551055
host_info = rctx_host_info,
10561056
)

toolchain/internal/repo.bzl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ common_attrs = {
3535
"in the list of known llvm_distributions using the provided version. " +
3636
"If unset, a default value is set from the `llvm_version` attribute."),
3737
),
38+
"extra_llvm_distributions": attr.string_dict(
39+
mandatory = False,
40+
doc = ("A dictionary that maps distributions to their SHA256 values. " +
41+
"It allows for simple additon of llvm distributiosn using the " +
42+
"'utils/lvm_checksums.sh' tool. This also allows to use the " +
43+
"distributions lists of future toolchain versions."),
44+
),
3845
"exec_os": attr.string(
3946
mandatory = False,
4047
doc = "Execution platform OS, if different from host OS.",
@@ -55,13 +62,6 @@ llvm_repo_attrs.update({
5562
"supported on the OS/arch. Further, requirements can be provided, e.g. " +
5663
"`latest:>=17.0.4,!=19.0.7`."),
5764
),
58-
"extra_llvm_distributions": attr.string_dict(
59-
mandatory = False,
60-
doc = ("A dictionary that maps distributions to their SHA256 values. " +
61-
"It allows for simple additon of llvm distributiosn using the " +
62-
"'utils/lvm_checksums.sh' tool. This also allows to use the " +
63-
"distributions lists of future toolchain versions."),
64-
),
6565
"urls": attr.string_list_dict(
6666
mandatory = False,
6767
doc = ("URLs to LLVM pre-built binary distribution archives, keyed by host OS " +

0 commit comments

Comments
 (0)