diff options
| author | León Orell Valerian Liehr <me@fmease.dev> | 2024-10-23 17:24:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-23 17:24:31 +0200 |
| commit | bb65499b616fa16d9703757dc155282645a0788a (patch) | |
| tree | 0847551d6ac5a05528bf82f4bb490b695cc49d76 /src/bootstrap | |
| parent | 03cb7de189e4b742096f7b8566baa18864a5da46 (diff) | |
| parent | 47d6667454f89516f86ebebd272cfc01282e4d66 (diff) | |
| download | rust-bb65499b616fa16d9703757dc155282645a0788a.tar.gz rust-bb65499b616fa16d9703757dc155282645a0788a.zip | |
Rollup merge of #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 https://github.com/rust-lang/rust/pull/97513 (specifically in [this commit](https://github.com/rust-lang/rust/pull/97513/commits/345eb14f6c841cd38e76a5b0bbf99e1b94a90d40)). Also, since https://github.com/rust-lang/rust/pull/123942, vendoring is now possible even in git sources, which means we shouldn't remove `.cargo` directory in git sources anymore.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 04909cd7921..d7ae0299dd6 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -1092,9 +1092,6 @@ class RustBuild(object): 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.""" |