diff options
| author | Yuki Okushi <jtitor@2k36.org> | 2023-04-25 02:33:30 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-25 02:33:30 +0900 |
| commit | b708aadfbe70e7146d57404db66a3e9ca8c93e5d (patch) | |
| tree | 28a54d97abf27f5ca08325b3e30ce2c084f3fe82 | |
| parent | 4d3ab3da4e1db5003995edd9777195b87f358919 (diff) | |
| parent | f5e535cb3e5fd99d7aeb21b92896dba72908af92 (diff) | |
| download | rust-b708aadfbe70e7146d57404db66a3e9ca8c93e5d.tar.gz rust-b708aadfbe70e7146d57404db66a3e9ca8c93e5d.zip | |
Rollup merge of #110744 - weihanglo:cargo-credential-install, r=ehuss
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 ```
| -rw-r--r-- | src/bootstrap/tool.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index f3724b2c0e4..9418cf0a7ed 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -573,18 +573,18 @@ impl Step for Cargo { if self.target.contains("windows") { build_cred( "cargo-credential-wincred", - "src/tools/cargo/crates/credential/cargo-credential-wincred", + "src/tools/cargo/credential/cargo-credential-wincred", ); } if self.target.contains("apple-darwin") { build_cred( "cargo-credential-macos-keychain", - "src/tools/cargo/crates/credential/cargo-credential-macos-keychain", + "src/tools/cargo/credential/cargo-credential-macos-keychain", ); } build_cred( "cargo-credential-1password", - "src/tools/cargo/crates/credential/cargo-credential-1password", + "src/tools/cargo/credential/cargo-credential-1password", ); cargo_bin_path } |