bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

linker: Implicitly link native libs as whole-archive in some more cases

Browse source
This commit is contained in:
Vadim Petrochenkov 2022-04-02 14:31:34 +03:00
parent b6a34f35e5
commit a169d337e4
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_codegen_ssa/src/back/link.rs
View file

@ -2079,9 +2079,14 @@ fn add_local_native_libraries(
NativeLibKind::Framework { as_needed } => { NativeLibKind::Framework { as_needed } => {
cmd.link_framework(name, as_needed.unwrap_or(true)) cmd.link_framework(name, as_needed.unwrap_or(true))
} }
NativeLibKind::Static { whole_archive, .. } => { NativeLibKind::Static { whole_archive, bundle, .. } => {
if whole_archive == Some(true) if whole_archive == Some(true)
|| (whole_archive == None && default_to_whole_archive(sess, crate_type, cmd)) || (whole_archive == None && default_to_whole_archive(sess, crate_type, cmd))
// Backward compatibility case: this can be a rlib (so `+whole-archive` cannot
// be added explicitly if necessary, see the error in `fn link_rlib`) compiled
// as an executable due to `--test`. Use whole-archive implicitly, like before
// the introduction of native lib modifiers.
|| (bundle != Some(false) && sess.opts.test)
{ {
cmd.link_whole_staticlib( cmd.link_whole_staticlib(
name, name,