Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/cargo/core/compiler/compilation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,11 @@ impl<'gctx> Compilation<'gctx> {
cmd: T,
pkg: &Package,
) -> CargoResult<ProcessBuilder> {
let builder = if let Some((runner, args)) = self.target_runner(CompileKind::Host) {
// Only use host runner when -Zhost-config is enabled
// to ensure `target.<host>.runner` does not wrap build scripts.
let builder = if !self.gctx.target_applies_to_host()?
&& let Some((runner, args)) = self.target_runner(CompileKind::Host)
{
let mut builder = ProcessBuilder::new(runner);
builder.args(args);
builder.arg(cmd);
Expand Down
28 changes: 28 additions & 0 deletions tests/testsuite/build_script.rs
Original file line number Diff line number Diff line change
Expand Up @@ -963,6 +963,34 @@ Caused by:
.run();
}

#[cargo_test]
fn target_runner_does_not_apply_to_build_script() {
// Regression test for https://github.com/rust-lang/miri/issues/4855
// `target.<host>.runner` should not wrap build scripts.
let target = rustc_host();
let p = project()
.file(
".cargo/config.toml",
&format!(
r#"
[target.{target}]
runner = "nonexistent-runner"
"#,
),
)
.file("build.rs", "fn main() {}")
.file("src/lib.rs", "")
.build();

p.cargo("check")
.with_stderr_data(str![[r#"
[COMPILING] foo v0.0.1 ([ROOT]/foo)
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s

"#]])
.run();
}

#[cargo_test]
fn custom_build_script_wrong_rustc_flags() {
let p = project()
Expand Down