Implement "if-available" option for download-ci-llvm

This commit is contained in:
Antoine Martin 2020-10-13 16:57:58 +02:00
parent d772879df3
commit ab614b0f01
4 changed files with 22 additions and 4 deletions

View file

@ -447,7 +447,8 @@ class RustBuild(object):
def downloading_llvm(self):
opt = self.get_toml('download-ci-llvm', 'llvm')
return opt == "true"
return opt == "true" \
or (opt == "if-available" and self.build == "x86_64-unknown-linux-gnu")
def _download_stage0_helper(self, filename, pattern, tarball_suffix, date=None):
if date is None:
@ -892,7 +893,7 @@ class RustBuild(object):
submodules_names = []
for module in submodules:
if module.endswith("llvm-project"):
if self.get_toml('llvm-config') or self.get_toml('download-ci-llvm') == 'true':
if self.get_toml('llvm-config') or self.downloading_llvm():
if self.get_toml('lld') != 'true':
continue
check = self.check_submodule(module, slow_submodules)