Skip to content

Inform the msvc linker about local and upstream native libraries #84264

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

Closed
wants to merge 1 commit into from
Closed

Inform the msvc linker about local and upstream native libraries #84264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions compiler/rustc_codegen_ssa/src/back/link.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1809,9 +1809,9 @@ fn add_local_native_libraries(
None => continue,
};
match lib.kind {
NativeLibKind::Dylib | NativeLibKind::Unspecified => cmd.link_dylib(name),
NativeLibKind::Dylib | NativeLibKind::Unspecified => cmd.link_local_dylib(name),
NativeLibKind::Framework => cmd.link_framework(name),
NativeLibKind::StaticNoBundle => cmd.link_staticlib(name),
NativeLibKind::StaticNoBundle => cmd.link_local_staticlib(name),
NativeLibKind::StaticBundle => cmd.link_whole_staticlib(name, &search_path),
NativeLibKind::RawDylib => {
// FIXME(#58713): Proper handling for raw dylibs.
Expand Down
19 changes: 16 additions & 3 deletions compiler/rustc_codegen_ssa/src/back/linker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ pub trait Linker {
fn link_staticlib(&mut self, lib: Symbol);
fn link_rlib(&mut self, lib: &Path);
fn link_whole_rlib(&mut self, lib: &Path);
fn link_local_dylib(&mut self, lib: Symbol) {
self.link_dylib(lib)
}
fn link_local_staticlib(&mut self, lib: Symbol) {
self.link_staticlib(lib)
}
fn link_whole_staticlib(&mut self, lib: Symbol, search_path: &[PathBuf]);
fn include_path(&mut self, path: &Path);
fn framework_path(&mut self, path: &Path);
Expand Down Expand Up @@ -709,7 +715,7 @@ impl<'a> Linker for MsvcLinker<'a> {
}

fn link_dylib(&mut self, lib: Symbol) {
self.cmd.arg(&format!("{}.lib", lib));
self.link_staticlib(lib);
}

fn link_rust_dylib(&mut self, lib: Symbol, path: &Path) {
Expand All @@ -723,10 +729,17 @@ impl<'a> Linker for MsvcLinker<'a> {
}
}

fn link_staticlib(&mut self, lib: Symbol) {
fn link_local_dylib(&mut self, lib: Symbol) {
self.link_local_staticlib(lib);
}
fn link_local_staticlib(&mut self, lib: Symbol) {
self.cmd.arg(&format!("{}.lib", lib));
}

fn link_staticlib(&mut self, lib: Symbol) {
self.cmd.arg(&format!("/DEFAULTLIB:{}.lib", lib));
}

fn full_relro(&mut self) {
// noop
}
Expand Down Expand Up @@ -767,7 +780,7 @@ impl<'a> Linker for MsvcLinker<'a> {
}

fn link_whole_staticlib(&mut self, lib: Symbol, _search_path: &[PathBuf]) {
self.link_staticlib(lib);
self.cmd.arg(format!("{}.lib", lib));
self.cmd.arg(format!("/WHOLEARCHIVE:{}.lib", lib));
}
fn link_whole_rlib(&mut self, path: &Path) {
Expand Down