Skip to content

Commit 9caf08f

Browse files
authored
Rollup merge of rust-lang#76127 - petrochenkov:lld, r=Mark-Simulacrum
rustbuild: Remove one LLD workaround The version of LLD shipped with Rust no longer have this issue. Closes rust-lang#68647
2 parents d8eb301 + 21c624a commit 9caf08f

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

src/bootstrap/builder.rs

+2-6
Original file line numberDiff line numberDiff line change
@@ -1041,15 +1041,11 @@ impl<'a> Builder<'a> {
10411041
}
10421042
}
10431043

1044-
// FIXME: Don't use LLD with MSVC if we're compiling libtest, since it fails to link it.
1045-
// See https://github.com/rust-lang/rust/issues/68647.
1046-
let can_use_lld = mode != Mode::Std;
1047-
1048-
if let Some(host_linker) = self.linker(compiler.host, can_use_lld) {
1044+
if let Some(host_linker) = self.linker(compiler.host, true) {
10491045
cargo.env("RUSTC_HOST_LINKER", host_linker);
10501046
}
10511047

1052-
if let Some(target_linker) = self.linker(target, can_use_lld) {
1048+
if let Some(target_linker) = self.linker(target, true) {
10531049
let target = crate::envify(&target.triple);
10541050
cargo.env(&format!("CARGO_TARGET_{}_LINKER", target), target_linker);
10551051
}

0 commit comments

Comments
 (0)