Don't prepend CARGO_HOME/bin unnecessarily#2978
Merged
kinnison merged 3 commits intorust-lang:masterfrom Apr 18, 2022
Merged
Conversation
The current logic forces nested invocations to execute `cargo` and friends from `$CARGO_HOME/bin`. This makes rustup break in environments where the appropriate rustup proxies to use happen to be installed elsewhere (earlier on `$PATH`), and using the binaries in `$CARGO_HOME/bin` would not work correctly. It also ensures that Rustup won't change `$PATH` "just for the heck of it", which _should_ help reduce unnecessary re-compilations when downstream build logic notices that `$PATH` changes (since it will no longer). Helps with rust-lang#2848. Fixes rust-lang/cargo#7431.
added 2 commits
April 14, 2022 16:10
On Windows for example, another path is added into the mix, but it doesn't affect what we want to test for.
Contributor
Author
|
The armv7 build failure appears to be a Docker problem. Daniel's take (on Discord) was:
The FreeBSD failure appears to be a time-out unrelated to this change. |
Member
|
For the timeout issue on cirrus-ci, you can increase the build time limit like this: |
tiagolobocastro
added a commit
to openebs/mayastor-control-plane
that referenced
this pull request
Dec 13, 2022
Avoids a bug where rustup adds cargo bin twice: rust-lang/rustup#2978 For all intents and purposes we should be fine to use the current path from runtime. Signed-off-by: Tiago Castro <tiagolobocastro@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The current logic forces nested invocations to execute
cargoandfriends from
$CARGO_HOME/bin. This makes rustup break in environmentswhere the appropriate rustup proxies to use happen to be installed
elsewhere (earlier on
$PATH), and using the binaries in$CARGO_HOME/binwould not work correctly.It also ensures that Rustup won't change
$PATH"just for the heck ofit", which should help reduce unnecessary re-compilations when
downstream build logic notices that
$PATHchanges (since it will nolonger).
Helps with #2848.
Fixes rust-lang/cargo#7431.