Skip to content

Commit ced8e65

Browse files
committed
Auto merge of rust-lang#135336 - tshepang:patch-5, r=jieyouxu
clarify and document needs-dynamic-linking try-job: test-various
2 parents 552a959 + d5f6456 commit ced8e65

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/doc/rustc-dev-guide/src/tests/directives.md

+2
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,8 @@ settings:
192192
specified atomic widths, e.g. the test with `//@ needs-target-has-atomic: 8,
193193
16, ptr` will only run if it supports the comma-separated list of atomic
194194
widths.
195+
- `needs-dynamic-linking` - ignores if target does not support dynamic linking
196+
(which is orthogonal to it being unable to create `dylib` and `cdylib` crate types)
195197

196198
The following directives will check LLVM support:
197199

tests/ui/invalid-compile-flags/crate-type-flag.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
//@[staticlib] compile-flags: --crate-type=staticlib
1818
//@[staticlib] check-pass
1919

20-
//@[dylib] ignore-musl (dylibs are not supported)
21-
//@[dylib] ignore-wasm (dylibs are not supported)
20+
//@[dylib] ignore-musl (dylib is supported, but musl libc is statically linked by default)
21+
//@[dylib] ignore-wasm (dylib is not supported)
2222
//@[dylib] compile-flags: --crate-type=dylib
2323
//@[dylib] check-pass
2424

25-
//@[cdylib] ignore-musl (cdylibs are not supported)
25+
//@[cdylib] ignore-musl (cdylib is supported, but musl libc is statically linked by default)
2626
//@[cdylib] compile-flags: --crate-type=cdylib
2727
//@[cdylib] check-pass
2828

@@ -39,9 +39,7 @@
3939
//@[multivalue] compile-flags: --crate-type=lib,rlib,staticlib
4040
//@[multivalue] check-pass
4141

42-
//@[multivalue_combined] ignore-musl (dylibs are not supported)
43-
//@[multivalue_combined] ignore-wasm (dylibs are not supported)
44-
//@[multivalue_combined] compile-flags: --crate-type=lib,rlib,staticlib --crate-type=dylib
42+
//@[multivalue_combined] compile-flags: --crate-type=lib,rlib --crate-type=staticlib
4543
//@[multivalue_combined] check-pass
4644

4745
// `proc-macro` is accepted, but `proc_macro` is not.

0 commit comments

Comments
 (0)