Skip to content

Commit 3a04d44

Browse files
committed
bootstrap: provide host rust_test_helpers to compiletest, not just target.
1 parent 840c301 commit 3a04d44

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/bootstrap/test.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -978,6 +978,8 @@ impl Step for Compiletest {
978978

979979
// HACK(eddyb) ensure that `libproc_macro` is available on the host.
980980
builder.ensure(compile::Test { compiler, target: compiler.host });
981+
// Also provide `rust_test_helpers` for the host.
982+
builder.ensure(native::TestHelpers { target: compiler.host });
981983

982984
builder.ensure(native::TestHelpers { target });
983985
builder.ensure(RemoteCopyLibs { compiler, target });
@@ -1046,7 +1048,11 @@ impl Step for Compiletest {
10461048
cmd.arg("--linker").arg(linker);
10471049
}
10481050

1049-
let hostflags = flags.clone();
1051+
let mut hostflags = flags.clone();
1052+
hostflags.push(format!(
1053+
"-Lnative={}",
1054+
builder.test_helpers_out(compiler.host).display()
1055+
));
10501056
cmd.arg("--host-rustcflags").arg(hostflags.join(" "));
10511057

10521058
let mut targetflags = flags;

0 commit comments

Comments
 (0)