diff options
| author | bors <bors@rust-lang.org> | 2022-06-10 06:25:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-06-10 06:25:02 +0000 |
| commit | 3dea0033f7f40fc3a96b728cb2095da91135f0a4 (patch) | |
| tree | c2982ce5ea796db251e8c2f73652547033511657 /compiler/rustc_session/src | |
| parent | 52ee2a2738c957ca6fd54e97b4e090a266ba96ba (diff) | |
| parent | a8ee1f3a4f6ee7f788ad53e28e2945e0cb7a1cce (diff) | |
| download | rust-3dea0033f7f40fc3a96b728cb2095da91135f0a4.tar.gz rust-3dea0033f7f40fc3a96b728cb2095da91135f0a4.zip | |
Auto merge of #95818 - petrochenkov:stabundle, r=wesleywiser
Stabilize the `bundle` native library modifier And remove the legacy `static-nobundle` linking kind. Stabilization report - https://github.com/rust-lang/rust/pull/95818#issuecomment-1120470945. cc #81490 Closes #37403
Diffstat (limited to 'compiler/rustc_session/src')
| -rw-r--r-- | compiler/rustc_session/src/config.rs | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs index cabaf321f80..c4a67006504 100644 --- a/compiler/rustc_session/src/config.rs +++ b/compiler/rustc_session/src/config.rs @@ -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", |