Skip to content

Commit

Permalink
Unrolled build for rust-lang#132054
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#132054 - onur-ozkan:cargo-config, r=Kobzol

do not remove `.cargo` directory

If vendoring isn't used bootstrap removes `.cargo` directory, which prevents developers from setting certain options in the `.cargo/config.toml` file. This was introduced in rust-lang#97513 (specifically in [this commit](rust-lang@345eb14)). Also, since rust-lang#123942, vendoring is now possible even in git sources, which means we shouldn't remove `.cargo` directory in git sources anymore.
  • Loading branch information
rust-timer authored Oct 23, 2024
2 parents be01dab + 47d6667 commit 0cb5512
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions src/bootstrap/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -1092,9 +1092,6 @@ def check_vendored_status(self):
if not os.path.exists(cargo_dir):
eprint('ERROR: vendoring required, but .cargo/config does not exist.')
raise Exception("{} not found".format(cargo_dir))
else:
if os.path.exists(cargo_dir):
shutil.rmtree(cargo_dir)

def parse_args(args):
"""Parse the command line arguments that the python script needs."""
Expand Down

0 comments on commit 0cb5512

Please sign in to comment.