Allow building Miri with --features from miri-script #4396
Conversation
Otherwise there was no way to pass e.g. `--features tracing` just to the `cargo` commands issued on the root repository: CARGO_EXTRA_FLAGS applies the flags to the "cargo-miri" crate, too, which does not make sense for crate-specific features.
Since the second concatenation was against an absolute path, it didn't do anything. This also makes the interface of install_to_sysroot() similar to that of cargo_cmd()
Also fix not passing features to one of the cargo invocations for test
Stypox
force-pushed
the
build-with-features
branch
from
6eba306 to
967a531
Compare
There was a problem hiding this comment.
Thanks for the review! I force pushed to remove the unrelated file (I made the commit a few weeks ago and cherry picked it a few times, and that file was committed accidentally at some point, sorry for not noticing). I also pushed a commit to add --features to clippy and to auto_actions and to fix the order of features and flags.
| | Command::Run { features, .. } | ||
| | Command::Doc { features, .. } | ||
| | Command::Clippy { features, .. } => Self::auto_actions(features.clone())?, | ||
| | Command::Fmt { .. } => Self::auto_actions(vec![])?, |
There was a problem hiding this comment.
Fmt does not have features, however the features might be needed for some auto action. Should I add features to Fmt too, and expand its doc to explain how it's not actually used for Fmt but rather for auto actions?
There was a problem hiding this comment.
Adding this to fmt just for auto-clippy doesn't make sense IMO. I don't think auto-clippy should enable any features... but I don't use auto-clippy anyway. @oli-obk what do you think?
There was a problem hiding this comment.
auto-clippy should be indistinguishable from ./miri clippy, so no features, yes.
I added the
--featuresflag to allCommands for whichcargocan accept--features, i.e. install, build, check, test, run, doc. Those who can't accept--featuresare clippy, fmt, toolchain, rustc pull, rustc push, squash (the last 4 are not even cargo commands). Furthermore, I did not add it to theBenchcommand since that command doesn't take any "--flags" either.This PR is needed because there is no way to pass e.g.
--features tracingjust to thecargocommands issued on the root repository. UnfortunatelyCARGO_EXTRA_FLAGSapplies the flags to the "cargo-miri" crate, too, which does not make sense for crate-specific features.This PR also includes a small commit to make the interface of
install_to_sysrootclearer.Note: this PR is the counterpart to rust-lang/rust#142379, which is for when Miri is built in the rustc repo.