diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2021-01-30 13:37:04 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-30 13:37:04 +0900 |
| commit | 31e7634749a737be8118ec8fe92c2dfcd2d10046 (patch) | |
| tree | 9d0f101bcfa3e73b14bd751049bd48b80d9e9f61 /src/bootstrap/bootstrap.py | |
| parent | e3905aa5af01ec9104253ed2d1b5b9ce81e98651 (diff) | |
| parent | db115f13f398ace4a207afc1beacde6a990f2f53 (diff) | |
| download | rust-31e7634749a737be8118ec8fe92c2dfcd2d10046.tar.gz rust-31e7634749a737be8118ec8fe92c2dfcd2d10046.zip | |
Rollup merge of #81520 - jyn514:rustc2, r=Mark-Simulacrum
Don't clone LLVM submodule when download-ci-llvm is set Previously, `downloading_llvm` would check `self.build` while it was still an empty string, and think it was always false. This fixes the check. This addresses the worst part of https://github.com/rust-lang/rust/issues/76653. There are still some large submodules being downloaded (in particular, `rustc-by-example` is 146 MB, and all the submodules combined are 311 MB), but this is a lot better than the whopping 1.4 GB before.
Diffstat (limited to 'src/bootstrap/bootstrap.py')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 5b0b89cc2db..6708b27b505 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -1086,10 +1086,10 @@ def bootstrap(help_triggered): else: build.set_normal_environment() + build.build = args.build or build.build_triple() build.update_submodules() # Fetch/build the bootstrap - build.build = args.build or build.build_triple() build.download_stage0() sys.stdout.flush() build.ensure_vendored() |