Skip to content

Commit 01814d4

Browse files
committed
sync
1 parent 01cff84 commit 01814d4

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

toolchain/internal/llvm_distributions.bzl

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,8 @@ def _get_llvm_version(rctx):
789789

790790
def _get_all_llvm_distributions(*, llvm_distributions, extra_llvm_distributions, parsed_llvm_version):
791791
distributions = {}
792-
for basename, sha256 in llvm_distributions.items():
792+
for dist, sha256 in llvm_distributions.items() + (extra_llvm_distributions.items() if extra_llvm_distributions else []):
793+
basename = _distribution_basename(dist)
793794
version = _distribution_version(basename)
794795
if parsed_llvm_version and parsed_llvm_version != version:
795796
continue
@@ -798,16 +799,6 @@ def _get_all_llvm_distributions(*, llvm_distributions, extra_llvm_distributions,
798799
sha256 = sha256,
799800
version = version,
800801
)
801-
if extra_llvm_distributions:
802-
for dist, sha256 in extra_llvm_distributions.items():
803-
version = _distribution_version(dist)
804-
if parsed_llvm_version and parsed_llvm_version != version:
805-
continue
806-
distributions[_distribution_basename(dist)] = struct(
807-
distribution = dist,
808-
sha256 = sha256,
809-
version = version,
810-
)
811802
return distributions
812803

813804
_UBUNTU_NAMES = [
@@ -1135,7 +1126,11 @@ def _required_llvm_release_name(*, version_or_requirements, all_llvm_distributio
11351126
return None, None, "ERROR: No matching distribution found."
11361127

11371128
def required_llvm_release_name_rctx(rctx, llvm_version):
1138-
all_llvm_distributions = _get_all_llvm_distributions(rctx)
1129+
all_llvm_distributions = _get_all_llvm_distributions(
1130+
llvm_distributions = _llvm_distributions,
1131+
extra_llvm_distributions = rctx.attr.extra_llvm_distributions,
1132+
parsed_llvm_version = _parse_version(llvm_version),
1133+
)
11391134
return _required_llvm_release_name(
11401135
version_or_requirements = llvm_version,
11411136
all_llvm_distributions = all_llvm_distributions,
@@ -1424,7 +1419,7 @@ def _distributions_test_writer_impl(ctx):
14241419
ctx.actions.write(ctx.outputs.select, "\n".join(select) + "\n")
14251420

14261421
write_distributions = rule(
1427-
implementation = _write_distributions_impl,
1422+
implementation = _distributions_test_writer_impl,
14281423
attrs = {
14291424
"output": attr.output(mandatory = True),
14301425
"select": attr.output(mandatory = True),

0 commit comments

Comments
 (0)