Skip to content

Conversation

@nnethercote
Copy link
Contributor

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.

`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

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
@Mark-Simulacrum
Copy link
Member

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

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

Deployed this morning.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants