bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

MsvcLinker: allow linking dynamically to Meson and MinGW-style named libraries

Browse source 
Fixes #122455
This commit is contained in:
L. E. Segovia 2024-04-03 20:08:56 -03:00
parent a7399ba69d
commit 98481be353
3 changed files with 50 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_codegen_ssa/src/back/linker.rs
View file

@ -7,7 +7,9 @@ use std::{env, iter, mem, str};
use cc::windows_registry;
use rustc_hir::def_id::{CrateNum, LOCAL_CRATE};
use rustc_metadata::{find_native_static_library, try_find_native_static_library};
use rustc_metadata::{
find_native_static_library, try_find_native_dynamic_library, try_find_native_static_library,
};
use rustc_middle::bug;
use rustc_middle::middle::dependency_format::Linkage;
use rustc_middle::middle::exported_symbols;
@ -878,7 +880,13 @@ impl<'a> Linker for MsvcLinker<'a> {
}
fn link_dylib_by_name(&mut self, name: &str, verbatim: bool, _as_needed: bool) {
self.link_arg(format!("{}{}", name, if verbatim { "" } else { ".lib" }));
// On MSVC-like targets rustc supports import libraries using alternative naming
// scheme (`libfoo.a`) unsupported by linker, search for such libraries manually.
if let Some(path) = try_find_native_dynamic_library(self.sess, name, verbatim) {
self.link_arg(path);
} else {
self.link_arg(format!("{}{}", name, if verbatim { "" } else { ".lib" }));
}
}
fn link_dylib_by_path(&mut self, path: &Path, _as_needed: bool) {