Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[beta] Ensure self-contained linker is only enabled on dev/nightly #126278

Merged
merged 2 commits into from
Jun 13, 2024
Merged

[beta] Ensure self-contained linker is only enabled on dev/nightly #126278

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba643c5
fix rustfmt issue in libstd
lqd Jun 11, 2024
50cb2ef
ensure the self-contained linker is only enabled on nightly/dev
lqd Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
ensure the self-contained linker is only enabled on nightly/dev
  • Loading branch information
@lqd
lqd committed Jun 11, 2024
commit 50cb2efdc57d6b06b3305f27f83d5e307d657f85
4 changes: 3 additions & 1 deletion src/bootstrap/src/core/build_steps/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1137,7 +1137,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
Loading