Skip to content

Commit 31e7634

Browse files
authored
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 #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.
2 parents e3905aa + db115f1 commit 31e7634

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/bootstrap/bootstrap.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1086,10 +1086,10 @@ def bootstrap(help_triggered):
10861086
else:
10871087
build.set_normal_environment()
10881088

1089+
build.build = args.build or build.build_triple()
10891090
build.update_submodules()
10901091

10911092
# Fetch/build the bootstrap
1092-
build.build = args.build or build.build_triple()
10931093
build.download_stage0()
10941094
sys.stdout.flush()
10951095
build.ensure_vendored()

0 commit comments

Comments
 (0)