nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-27 17:24:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #90800 - aplanas:fix_cargo_config, r=Mark-Simulacrum

Browse Source 
bootstap: create .cargo/config only if not present

In some situations we should want on influence into the .cargo/config
when we use vendored source.  One example is #90764, when we want to
workaround some references to crates forked and living in git, that are
missing in the vendor/ directory.

This commit will create the .cargo/config file only when the .cargo/
directory needs to be created.
This commit is contained in:
Yuki Okushi 2021-11-19 13:06:35 +09:00 committed by GitHub
commit b542224fa5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/bootstrap/bootstrap.py
View File

@ -1119,17 +1119,22 @@ class RustBuild(object):
raise Exception("{} not found".format(vendor_dir)) raise Exception("{} not found".format(vendor_dir))
if self.use_vendored_sources: if self.use_vendored_sources:
config = ("[source.crates-io]\n"
"replace-with = 'vendored-sources'\n"
"registry = 'https://example.com'\n"
"\n"
"[source.vendored-sources]\n"
"directory = '{}/vendor'\n"
.format(self.rust_root))
if not os.path.exists('.cargo'): if not os.path.exists('.cargo'):
os.makedirs('.cargo') os.makedirs('.cargo')
with output('.cargo/config') as cargo_config: with output('.cargo/config') as cargo_config:
cargo_config.write( cargo_config.write(config)
"[source.crates-io]\n" else:
"replace-with = 'vendored-sources'\n" print('info: using vendored source, but .cargo/config is already present.')
"registry = 'https://example.com'\n" print(' Reusing the current configuration file. But you may want to '
"\n" 'configure vendoring like this:')
"[source.vendored-sources]\n" print(config)
"directory = '{}/vendor'\n"
.format(self.rust_root))
else: else:
if os.path.exists('.cargo'): if os.path.exists('.cargo'):
shutil.rmtree('.cargo') shutil.rmtree('.cargo')