bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Don't allow both the +bundle and +whole-archive modifiers for rlibs

Browse source
This commit is contained in:
Wesley Wiser 2021-08-20 16:25:39 -04:00 • committed by Michael Woerister
parent 522f9757f6
commit 846c372f86
5 changed files with 45 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -255,6 +255,19 @@ fn link_rlib<'a, B: ArchiveBuilder<'a>>(
// metadata of the rlib we're generating somehow.
for lib in codegen_results.crate_info.used_libraries.iter() {
match lib.kind {
NativeLibKind::Static { bundle: None | Some(true), whole_archive: Some(true) }
if flavor == RlibFlavor::Normal =>
{
// Don't allow mixing +bundle with +whole_archive since an rlib may contain
// multiple native libs, some of which are +whole-archive and some of which are
// -whole-archive and it isn't clear how we can currently handle such a
// situation correctly.
// See https://github.com/rust-lang/rust/issues/88085#issuecomment-901050897
sess.err(
"the linking modifiers `+bundle` and `+whole-archive` are not compatible \
with each other when generating rlibs",
);
}
NativeLibKind::Static { bundle: None | Some(true), .. } => {}
NativeLibKind::Static { bundle: Some(false), .. }
| NativeLibKind::Dylib { .. }
@ -1223,6 +1236,7 @@ pub fn archive_search_paths(sess: &Session) -> Vec<PathBuf> {
sess.target_filesearch(PathKind::Native).search_path_dirs()
}
#[derive(PartialEq)]
enum RlibFlavor {
Normal,
StaticlibBase,