Skip to content

Commit

Permalink
Unrolled build for rust-lang#136960
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#136960 - jyn514:compiletest-args, r=jieyouxu

Compiletest should not inherit all host RUSTFLAGS

I told ``@rhelmot`` to do this in rust-lang#134913. But it's not correct; compiletest shouldn't inherit RUSTFLAGS at all.

Pass a single new --host-rustcflags to compiletest instead, without overwriting any existing arguments.

Fixes the following failure, which only happens when building llvm from source and then running `x test --stage 1 ui-fulldeps`:
```
diff --git a/tests/ui-fulldeps/fluent-messages/test.stderr b/tests/ui-fulldeps/fluent-messages/test.stderr
index 0b3bb14ce51..978ac46c5a2 100644
--- a/tests/ui-fulldeps/fluent-messages/test.stderr
+++ b/tests/ui-fulldeps/fluent-messages/test.stderr
``@@`` -1,3 +1,8 ``@@``
+warning[E0602]: unknown lint: `linker_messages`
+   |
+   = note: requested on the command line with `-A linker_messages`
+   = note: `#[warn(unknown_lints)]` on by default
```

See https://rust-lang.zulipchat.com/#narrow/channel/182449-t-compiler.2Fhelp/topic/.E2.9C.94.20unknown.20lint.3A.20.60linker_messages.60.20when.20blessing.20tests.20on.20.2E.2E.2E for more context.
  • Loading branch information
rust-timer authored Feb 14, 2025
2 parents a567209 + 66ebee4 commit 4210340
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions src/bootstrap/src/core/build_steps/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1969,13 +1969,12 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
if !builder.config.dry_run() && suite.ends_with("fulldeps") {
let llvm_libdir =
command(&llvm_config).arg("--libdir").run_capture_stdout(builder).stdout();
let mut rustflags = env::var("RUSTFLAGS").unwrap_or_default();
if target.is_msvc() {
rustflags.push_str(&format!("-Clink-arg=-LIBPATH:{llvm_libdir}"));
let link_llvm = if target.is_msvc() {
format!("-Clink-arg=-LIBPATH:{llvm_libdir}")
} else {
rustflags.push_str(&format!("-Clink-arg=-L{llvm_libdir}"));
}
cmd.env("RUSTFLAGS", rustflags);
format!("-Clink-arg=-L{llvm_libdir}")
};
cmd.arg("--host-rustcflags").arg(link_llvm);
}

if !builder.config.dry_run() && matches!(mode, "run-make" | "coverage-run") {
Expand Down

0 comments on commit 4210340

Please sign in to comment.