diff options
| author | bors <bors@rust-lang.org> | 2020-09-23 10:38:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-09-23 10:38:18 +0000 |
| commit | 33aa8be8b5fa6872186a94d9e1fa5088da386e4b (patch) | |
| tree | e00e8a61a80cd477fe85bb7c5866cac55e75aeed /src/bootstrap | |
| parent | feca2c229e209ceda1eda7306e6ea9ee0aaa9305 (diff) | |
| parent | f05b47ccdfa63f8b4b9fb47a9aa92381801d3ff1 (diff) | |
| download | rust-33aa8be8b5fa6872186a94d9e1fa5088da386e4b.tar.gz rust-33aa8be8b5fa6872186a94d9e1fa5088da386e4b.zip | |
Auto merge of #76864 - est31:downloaded_llvm_no_clone_sources, r=Mark-Simulacrum
Don't download/sync llvm-project submodule if download-ci-llvm is set llvm-project takes > 1GB storage space and a long time to download. It's better to not download it unless needed.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index e58cf0d1641..1f0b55a7869 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -881,8 +881,9 @@ class RustBuild(object): submodules_names = [] for module in submodules: if module.endswith("llvm-project"): - if self.get_toml('llvm-config') and self.get_toml('lld') != 'true': - continue + if self.get_toml('llvm-config') or self.get_toml('download-ci-llvm') == 'true': + if self.get_toml('lld') != 'true': + continue check = self.check_submodule(module, slow_submodules) filtered_submodules.append((module, check)) submodules_names.append(module) |