Skip to content

Commit 7d5ff8b

Browse files
committed
Windows: Enable issue 70093 link tests
1 parent c156614 commit 7d5ff8b

File tree

4 files changed

+20
-13
lines changed

4 files changed

+20
-13
lines changed

src/tools/tidy/src/issues.txt

-2
Original file line numberDiff line numberDiff line change
@@ -2710,8 +2710,6 @@ ui/limits/issue-75158-64.rs
27102710
ui/link-native-libs/issue-109144.rs
27112711
ui/link-native-libs/issue-43925.rs
27122712
ui/link-native-libs/issue-43926.rs
2713-
ui/link-native-libs/issue-70093/issue-70093-link-directives.rs
2714-
ui/link-native-libs/issue-70093/issue-70093.rs
27152713
ui/linkage-attr/auxiliary/issue-12133-dylib.rs
27162714
ui/linkage-attr/auxiliary/issue-12133-dylib2.rs
27172715
ui/linkage-attr/auxiliary/issue-12133-rlib.rs

tests/ui/link-native-libs/issue-70093/issue-70093.rs

-10
This file was deleted.

tests/ui/link-native-libs/issue-70093/issue-70093-link-directives.rs renamed to tests/ui/link-native-libs/issue-70093/link-directives.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//@ run-pass
22
//@ compile-flags: -Zlink-directives=no
3-
//@ ignore-windows - this will probably only work on unixish systems
43
//@ ignore-fuchsia - missing __libc_start_main for some reason (#84733)
54
//@ ignore-cross-compile - default-linker-libraries=yes doesn't play well with cross compiling
65

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
//@ run-pass
2+
//@ compile-flags: -Zlink-native-libraries=no -Cdefault-linker-libraries=yes
3+
//@ ignore-fuchsia - missing __libc_start_main for some reason (#84733)
4+
//@ ignore-cross-compile - default-linker-libraries=yes doesn't play well with cross compiling
5+
6+
//@ revisions: other
7+
//@[other] ignore-msvc
8+
9+
//@ revisions: msvc
10+
// On Windows MSVC, default-linker-libraries=yes doesn't work because
11+
// rustc drives the linker directly instead of going through another compiler.
12+
// Therefore rustc would need to implement default-linker-libraries itself but doesn't.
13+
// So instead we use -Clink-arg to directly set the required msvcrt.lib as a link arg.
14+
//@[msvc] compile-flags: -Clink-arg=msvcrt.lib
15+
//@[msvc] only-msvc
16+
17+
#[link(name = "some-random-non-existent-library", kind = "static")]
18+
extern "C" {}
19+
20+
fn main() {}

0 commit comments

Comments
 (0)