user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #87619 - 12101111:fix-native_link_modifiers_bundle, r=petrochenkov

Browse source 
Fix feature gate checking of static-nobundle and native_link_modifiers

Feature native_link_modifiers_bundle don't need feature static-nobundle
to work.

Also check the feature gates when using native_link_modifiers from command line options. Current nighly compiler don't check those feature gate.

```
> touch lib.rs
> rustc +nightly lib.rs -L /usr/lib -l static:+bundle=dl --crate-type=rlib
> rustc +nightly lib.rs -L /usr/lib -l dylib:+as-needed=dl --crate-type=dylib -Ctarget-feature=-crt-static
> rustc +nightly lib.rs -L /usr/lib -l static:-bundle=dl --crate-type=rlib
error[E0658]: kind="static-nobundle" is unstable
  |
  = note: see issue #37403 <https://github.com/rust-lang/rust/issues/37403> for more information
  = help: add `#![feature(static_nobundle)]` to the crate attributes to enable

error: aborting due to previous error

For more information about this error, try `rustc --explain E0658`.

```

First found this in https://github.com/rust-lang/rust/pull/85600#discussion_r676612655
This commit is contained in:
bors 2021-08-09 03:59:30 +00:00
commit 7b52ad00cb
8 changed files with 75 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/test/ui/feature-gates/feature-gate-native_link_modifiers_bundle-2.rs Normal file
View file

@ -0,0 +1,10 @@
// Test native_link_modifiers_bundle don't need static-nobundle
// check-pass
#![feature(native_link_modifiers)]
#![feature(native_link_modifiers_bundle)]
#[link(name = "foo", kind = "static", modifiers = "-bundle")]
extern "C" {}
fn main() {}

3
src/test/ui/feature-gates/feature-gate-native_link_modifiers_bundle-3.rs Normal file
View file

@ -0,0 +1,3 @@
// compile-flags: -l static:-bundle=nonexistent
fn main() {}

2
src/test/ui/feature-gates/feature-gate-native_link_modifiers_bundle-3.stderr Normal file
View file

@ -0,0 +1,2 @@
error: linking modifiers are currently unstable, the `-Z unstable-options` flag must also be passed to use it

4
src/test/ui/feature-gates/feature-gate-static-nobundle-2.rs
View file

@ -1,6 +1,4 @@
//~ ERROR kind="static-nobundle" is unstable
// Test the behavior of rustc when non-existent library is statically linked
// check-pass
// compile-flags: -l static-nobundle=nonexistent
fn main() {}

8
src/test/ui/feature-gates/feature-gate-static-nobundle-2.stderr
View file

@ -1,10 +1,2 @@
warning: library kind `static-nobundle` has been superseded by specifying `-bundle` on library kind `static`. Try `static:-bundle`
error[E0658]: kind="static-nobundle" is unstable
|
= note: see issue #37403 <https://github.com/rust-lang/rust/issues/37403> for more information
= help: add `#![feature(static_nobundle)]` to the crate attributes to enable
error: aborting due to previous error
For more information about this error, try `rustc --explain E0658`.

4
src/test/ui/feature-gates/feature-gate-static-nobundle.stderr
View file

@ -5,10 +5,10 @@ LL | #[link(name = "foo", kind = "static-nobundle")]
| ^^^^^^^^^^^^^^^^^^^^^^^^
error[E0658]: kind="static-nobundle" is unstable
--> $DIR/feature-gate-static-nobundle.rs:1:1
--> $DIR/feature-gate-static-nobundle.rs:1:22
|
LL | #[link(name = "foo", kind = "static-nobundle")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| ^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: see issue #37403 <https://github.com/rust-lang/rust/issues/37403> for more information
= help: add `#![feature(static_nobundle)]` to the crate attributes to enable