bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Stabilize the bundle native library modifier

Browse source
This commit is contained in:
Vadim Petrochenkov 2022-04-08 18:20:57 +03:00
parent d7b8d77be5
commit a8ee1f3a4f
35 changed files with 91 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

20
compiler/rustc_session/src/config.rs
View file

@ -1920,21 +1920,6 @@ fn parse_native_lib_kind(
let kind = match kind {
"static" => NativeLibKind::Static { bundle: None, whole_archive: None },
"static-nobundle" => {
early_warn(
error_format,
"library kind `static-nobundle` has been superseded by specifying \
modifier `-bundle` with library kind `static`. Try `static:-bundle`",
);
if !nightly_options::match_is_nightly_build(matches) {
early_error(
error_format,
"library kind `static-nobundle` is unstable \
and only accepted on the nightly compiler",
);
}
NativeLibKind::Static { bundle: Some(false), whole_archive: None }
}
"dylib" => NativeLibKind::Dylib { as_needed: None },
"framework" => NativeLibKind::Framework { as_needed: None },
_ => early_error(
@ -1987,10 +1972,7 @@ fn parse_native_lib_modifiers(
}
};
match (modifier, &mut kind) {
("bundle", NativeLibKind::Static { bundle, .. }) => {
report_unstable_modifier();
assign_modifier(bundle)
}
("bundle", NativeLibKind::Static { bundle, .. }) => assign_modifier(bundle),
("bundle", _) => early_error(
error_format,
"linking modifier `bundle` is only compatible with `static` linking kind",