Skip to content

Commit

Permalink
Rollup merge of rust-lang#49721 - rust-lang:ishitatsuyuki-patch-1, r=…
Browse files Browse the repository at this point in the history
…Mark-Simulacrum

bootstrap: Remove the help fast path

This is rarely noticed, but when you have old submodules, not updating them will cause you run into rust-lang/cargo#4678.
  • Loading branch information
kennytm authored Apr 6, 2018
2 parents 1fa9eec + 4c51d47 commit 829d276
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions src/bootstrap/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit 829d276

Please sign in to comment.