Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Cargo selection #644

Merged
merged 2 commits into from Apr 8, 2020
Merged

Conversation

@nnethercote
Copy link
Collaborator

@nnethercote nnethercote commented Apr 8, 2020

On CI, this means that the correct Cargo revision (the one matching the rustc revision) is used, rather than whatever version of Cargo is found in $PATH.

For local runs, it means that the --cargo option will be heeded, instead of it (again) just using whatever version of Cargo is found in $PATH.

nnethercote added 2 commits Apr 8, 2020
`base_command` currently tries to choose the Cargo version via `$CARGO`.
But `cargo` doesn't consult `$CARGO`, so this has no effect, and the
`cargo` used is whatever is found in `$PATH`.

This commit fixes `base_command` to use the `cargo` specified in
`Compiler::cargo`.
It doesn't seem useful any more.
@Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Apr 8, 2020

This looks good to me. One thing that would be nice probably (though in a separate PR) is to gather the rustc -vV and cargo -vV output and dump it into the json we collect for (at least to start) manual inspection.

@Mark-Simulacrum Mark-Simulacrum merged commit f636e7c into rust-lang:master Apr 8, 2020
1 check passed
1 check passed
Travis CI - Pull Request Build Passed
Details
@Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Apr 8, 2020

I will deploy tomorrow morning (presuming I don't forget...).

@nnethercote nnethercote deleted the nnethercote:fix-cargo-selection branch Apr 8, 2020
@Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Apr 8, 2020

Deployed this morning.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.