mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #110744 - weihanglo:cargo-credential-install, r=ehuss

Browse Source 
bootstrap: update paths cargo-credential crate

This should be done in #110653 but forgot.

Fixes #110742

## How to verify this patch

Run `./x.py build cargo`. Previously it would fail with

```console
error: manifest path `/projects/rust/src/tools/cargo/crates/credential/cargo-credential-1password/Cargo.toml` does not exist
```
This commit is contained in:
Yuki Okushi 2023-04-25 02:33:30 +09:00 committed by GitHub
commit b708aadfbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bootstrap/tool.rs
View File

@ -573,18 +573,18 @@ impl Step for Cargo {
if self.target.contains("windows") { if self.target.contains("windows") {
build_cred( build_cred(
"cargo-credential-wincred", "cargo-credential-wincred",
"src/tools/cargo/crates/credential/cargo-credential-wincred", "src/tools/cargo/credential/cargo-credential-wincred",
); );
} }
if self.target.contains("apple-darwin") { if self.target.contains("apple-darwin") {
build_cred( build_cred(
"cargo-credential-macos-keychain", "cargo-credential-macos-keychain",
"src/tools/cargo/crates/credential/cargo-credential-macos-keychain", "src/tools/cargo/credential/cargo-credential-macos-keychain",
); );
} }
build_cred( build_cred(
"cargo-credential-1password", "cargo-credential-1password",
"src/tools/cargo/crates/credential/cargo-credential-1password", "src/tools/cargo/credential/cargo-credential-1password",
); );
cargo_bin_path cargo_bin_path
} }