squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

bootstrap: provide host rust_test_helpers to compiletest, not just target.

Browse source
This commit is contained in:
Eduard-Mihai Burtescu 2018-11-27 15:40:40 +02:00
parent 840c3010f5
commit 3a04d448f9
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/bootstrap/test.rs
View file

@ -978,6 +978,8 @@ impl Step for Compiletest {
// HACK(eddyb) ensure that `libproc_macro` is available on the host. // HACK(eddyb) ensure that `libproc_macro` is available on the host.
builder.ensure(compile::Test { compiler, target: compiler.host }); builder.ensure(compile::Test { compiler, target: compiler.host });
// Also provide `rust_test_helpers` for the host.
builder.ensure(native::TestHelpers { target: compiler.host });
builder.ensure(native::TestHelpers { target }); builder.ensure(native::TestHelpers { target });
builder.ensure(RemoteCopyLibs { compiler, target }); builder.ensure(RemoteCopyLibs { compiler, target });
@ -1046,7 +1048,11 @@ impl Step for Compiletest {
cmd.arg("--linker").arg(linker); cmd.arg("--linker").arg(linker);
} }
let hostflags = flags.clone(); let mut hostflags = flags.clone();
hostflags.push(format!(
"-Lnative={}",
builder.test_helpers_out(compiler.host).display()
));
cmd.arg("--host-rustcflags").arg(hostflags.join(" ")); cmd.arg("--host-rustcflags").arg(hostflags.join(" "));
let mut targetflags = flags; let mut targetflags = flags;