Skip to content

Commit 1e5bed4

Browse files
authored
Unrolled build for rust-lang#128807
Rollup merge of rust-lang#128807 - ChrisDenton:bloat, r=jieyouxu run-make: explaing why fmt-write-bloat is ignore-windows The trouble here is that libc doesn't exist on Windows. Well it kinda does but it isn't called that so we substitute a name that works. Ideally finding necessary libs for the platform would be done at a higher level but until then this should work. try-job: x86_64-msvc try-job: x86_64-mingw try-job: i686-msvc try-job: i686-mingw
2 parents 8291d68 + ef90df6 commit 1e5bed4

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

tests/run-make/fmt-write-bloat/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use core::fmt;
66
use core::fmt::Write;
77

8-
#[link(name = "c")]
8+
#[cfg_attr(not(windows), link(name = "c"))]
99
extern "C" {}
1010

1111
struct Dummy;

tests/run-make/fmt-write-bloat/rmake.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@
1515
//! `NO_DEBUG_ASSERTIONS=1`). If debug assertions are disabled, then we can check for the absence of
1616
//! additional `usize` formatting and padding related symbols.
1717
18-
// Reason: This test is `ignore-windows` because the `no_std` test (using `#[link(name = "c")])`
19-
// doesn't link on windows.
2018
//@ ignore-windows
19+
// Reason:
20+
// - MSVC targets really need to parse the .pdb file (aka the debug information).
21+
// On Windows there's an API for that (dbghelp) which maybe we can use
22+
// - MinGW targets have a lot of symbols included in their runtime which we can't avoid.
23+
// We would need to make the symbols we're looking for more specific for this test to work.
2124
//@ ignore-cross-compile
2225

2326
use run_make_support::env::no_debug_assertions;

0 commit comments

Comments
 (0)