diff options
| author | kennytm <kennytm@gmail.com> | 2018-04-07 14:51:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-07 14:51:34 +0800 |
| commit | 3e0b15f8243be22019e93755bf94f46c8a25f4de (patch) | |
| tree | 9a2cc49f4e76af0dd7f34ce642aa3a24c3d4328b /src | |
| parent | 3f26d01635b1f6a62b59bea138325582648c5530 (diff) | |
| parent | 4c51d47269a2610db6fde2660aac9aad3e10b4e2 (diff) | |
| download | rust-3e0b15f8243be22019e93755bf94f46c8a25f4de.tar.gz rust-3e0b15f8243be22019e93755bf94f46c8a25f4de.zip | |
Rollup merge of #49750 - ishitatsuyuki:boot-no-fast, r=Mark-Simulacrum
bootstrap: Remove the fast path This is rarely noticed, but when you have old submodules, not updating them will cause you run into https://github.com/rust-lang/cargo/issues/4678. (Reopen of #49721) r? @alexcrichton
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index cf54591f25c..487440becf6 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -770,10 +770,7 @@ def bootstrap(help_triggered): if 'dev' in data: build.set_dev_environment() - # No help text depends on submodules. This check saves ~1 minute of git commands, even if - # all the submodules are present and downloaded! - if not help_triggered: - build.update_submodules() + build.update_submodules() # Fetch/build the bootstrap build.build = args.build or build.build_triple() |
