nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-23 15:23:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

rustbuild: Remove one LLD workaround

Browse Source
This commit is contained in:
Vadim Petrochenkov 2020-08-30 17:51:17 +03:00
parent 85fbf49ce0
commit 21c624a230
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bootstrap/builder.rs
View File

@ -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. if let Some(host_linker) = self.linker(compiler.host, true) {
// 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) {
cargo.env("RUSTC_HOST_LINKER", host_linker); 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); let target = crate::envify(&target.triple);
cargo.env(&format!("CARGO_TARGET_{}_LINKER", target), target_linker); cargo.env(&format!("CARGO_TARGET_{}_LINKER", target), target_linker);
} }