Skip to content

Commit 7d4467f

Browse files
xbjfkDorianNiemiecSVRJS
authored andcommitted
musl: fix test build with musl 1.2.0+
Since musl 1.2.0, the utmpx.ut_session type changed from long to int (with padding). For now, skip the test for this field. Fixes: 3305 (backport <rust-lang#4438>) (cherry picked from commit aa08592)
1 parent e77bf38 commit 7d4467f

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

libc-test/build.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4880,7 +4880,9 @@ fn test_linux(target: &str) {
48804880
(struct_ == "statvfs" && field == "__f_spare") ||
48814881
(struct_ == "statvfs64" && field == "__f_spare") ||
48824882
// the `xsk_tx_metadata_union` field is an anonymous union
4883-
(struct_ == "xsk_tx_metadata" && field == "xsk_tx_metadata_union")
4883+
(struct_ == "xsk_tx_metadata" && field == "xsk_tx_metadata_union") ||
4884+
// FIXME(musl): After musl 1.2.0, the type becomes `int` instead of `long`.
4885+
(struct_ == "utmpx" && field == "ut_session")
48844886
});
48854887

48864888
cfg.skip_roundtrip(move |s| match s {

0 commit comments

Comments
 (0)