From 21c624a230dd52098501497e8ed04943e0b36d91 Mon Sep 17 00:00:00 2001 From: Vadim Petrochenkov Date: Sun, 30 Aug 2020 17:51:17 +0300 Subject: [PATCH] rustbuild: Remove one LLD workaround --- src/bootstrap/builder.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 54eb2e99b8ff8..cecc9ef75ea86 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -1041,15 +1041,11 @@ impl<'a> Builder<'a> { } } - // FIXME: Don't use LLD with MSVC if we're compiling libtest, since it fails to link it. - // See https://github.com/rust-lang/rust/issues/68647. - let can_use_lld = mode != Mode::Std; - - if let Some(host_linker) = self.linker(compiler.host, can_use_lld) { + if let Some(host_linker) = self.linker(compiler.host, true) { cargo.env("RUSTC_HOST_LINKER", host_linker); } - if let Some(target_linker) = self.linker(target, can_use_lld) { + if let Some(target_linker) = self.linker(target, true) { let target = crate::envify(&target.triple); cargo.env(&format!("CARGO_TARGET_{}_LINKER", target), target_linker); }