Skip to content

Commit

Permalink
Unrolled build for rust-lang#126282
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#126282 - lqd:contain-the-self-contained-linker, r=Mark-Simulacrum

Ensure self-contained linker is only enabled on dev/nightly

This is a version of rust-lang#126278 for the master branch. It should be no-op _here_, compared to beta.

I'll r? `@Mark-Simulacrum` like the other one.
  • Loading branch information
rust-timer authored Jun 12, 2024
2 parents c25ac9d + bbc5037 commit 0b78647
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/bootstrap/src/core/build_steps/compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1134,7 +1134,9 @@ pub fn rustc_cargo_env(
}

// Enable rustc's env var for `rust-lld` when requested.
if builder.config.lld_enabled {
if builder.config.lld_enabled
&& (builder.config.channel == "dev" || builder.config.channel == "nightly")
{
cargo.env("CFG_USE_SELF_CONTAINED_LINKER", "1");
}

Expand Down

0 comments on commit 0b78647

Please sign in to comment.