Skip to content

Commit af71a2b

Browse files
authored
Fix version variable check. (#576)
Exactly one must be present. This addresses: #575
1 parent c7a3d99 commit af71a2b

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

toolchain/rules.bzl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,12 @@ toolchain = repository_rule(
3838
)
3939

4040
def llvm_toolchain(name, **kwargs):
41-
if kwargs.get("llvm_version") == kwargs.get("llvm_versions"):
41+
if kwargs.get("llvm_version") and kwargs.get("llvm_versions"):
4242
fail("Exactly one of llvm_version or llvm_versions must be set")
43+
if not kwargs.get("llvm_versions"):
44+
if not kwargs.get("llvm_version"):
45+
fail("One of llvm_version or llvm_versions must be set")
46+
kwargs.update(llvm_versions = {"": kwargs.get("llvm_version")})
4347

4448
if not kwargs.get("toolchain_roots"):
4549
llvm_args = {
@@ -49,9 +53,6 @@ def llvm_toolchain(name, **kwargs):
4953
}
5054
llvm(name = name + "_llvm", **llvm_args)
5155

52-
if not kwargs.get("llvm_versions"):
53-
kwargs.update(llvm_versions = {"": kwargs.get("llvm_version")})
54-
5556
toolchain_args = {
5657
k: v
5758
for k, v in kwargs.items()

0 commit comments

Comments
 (0)