user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bootstrap: only build rust_test_helpers for {incremental,ui} suites

Browse source
This commit is contained in:
Jieyou Xu 2025-04-04 10:46:13 +08:00
parent 00095b3da4
commit c25207d869
No known key found for this signature in database
GPG key ID: 045B995028EA6AFC
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/bootstrap/src/core/build_steps/test.rs
View file

@ -1624,9 +1624,6 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
builder.tool_exe(Tool::RunMakeSupport);
}
// Also provide `rust_test_helpers` for the host.
builder.ensure(TestHelpers { target: compiler.host });
// ensure that `libproc_macro` is available on the host.
if suite == "mir-opt" {
builder.ensure(compile::Std::new(compiler, compiler.host).is_for_mir_opt_tests(true));
@ -1634,11 +1631,6 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
builder.ensure(compile::Std::new(compiler, compiler.host));
}
// As well as the target
if suite != "mir-opt" {
builder.ensure(TestHelpers { target });
}
let mut cmd = builder.tool_cmd(Tool::Compiletest);
if suite == "mir-opt" {
@ -1804,11 +1796,18 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
}
let mut hostflags = flags.clone();
hostflags.push(format!("-Lnative={}", builder.test_helpers_out(compiler.host).display()));
hostflags.extend(linker_flags(builder, compiler.host, LldThreads::No, compiler.stage));
let mut targetflags = flags;
targetflags.push(format!("-Lnative={}", builder.test_helpers_out(target).display()));
// Provide `rust_test_helpers` for both host and target.
if suite == "ui" || suite == "incremental" {
builder.ensure(TestHelpers { target: compiler.host });
builder.ensure(TestHelpers { target });
hostflags
.push(format!("-Lnative={}", builder.test_helpers_out(compiler.host).display()));
targetflags.push(format!("-Lnative={}", builder.test_helpers_out(target).display()));
}
for flag in hostflags {
cmd.arg("--host-rustcflags").arg(flag);