Skip to content

Commit

Permalink
Rollup merge of #81520 - jyn514:rustc2, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
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 #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.
  • Loading branch information
JohnTitor authored Jan 30, 2021
2 parents e3905aa + db115f1 commit 31e7634
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/bootstrap/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit 31e7634

Please sign in to comment.