Skip to content

Commit acd773d

Browse files
committed
Auto merge of #2684 - Amanieu:fix-android-ci, r=Amanieu
Fix multiple symbol definitions on Android CI The breakage was caused by rust-lang/rust#83822 which removed `-Wl,--allow-multiple-definition` from the Android target linker flags.
2 parents 7cd6a6f + 95c0d08 commit acd773d

File tree

1 file changed

+25
-0
lines changed

1 file changed

+25
-0
lines changed

libc-test/build.rs

+25
Original file line numberDiff line numberDiff line change
@@ -1652,6 +1652,9 @@ fn test_android(target: &str) {
16521652
// FIXME: `sighandler_t` type is incorrect, see:
16531653
// https://github.com/rust-lang/libc/issues/1359
16541654
"sighandler_t" => true,
1655+
1656+
// These are tested in the `linux_elf.rs` file.
1657+
"Elf64_Phdr" | "Elf32_Phdr" => true,
16551658
_ => false,
16561659
}
16571660
});
@@ -1669,12 +1672,33 @@ fn test_android(target: &str) {
16691672
// 'private' type
16701673
"prop_info" => true,
16711674

1675+
// These are tested in the `linux_elf.rs` file.
1676+
"Elf64_Phdr" | "Elf32_Phdr" => true,
1677+
16721678
_ => false,
16731679
}
16741680
});
16751681

16761682
cfg.skip_const(move |name| {
16771683
match name {
1684+
// The IPV6 constants are tested in the `linux_ipv6.rs` tests:
1685+
| "IPV6_FLOWINFO"
1686+
| "IPV6_FLOWLABEL_MGR"
1687+
| "IPV6_FLOWINFO_SEND"
1688+
| "IPV6_FLOWINFO_FLOWLABEL"
1689+
| "IPV6_FLOWINFO_PRIORITY"
1690+
// The F_ fnctl constants are tested in the `linux_fnctl.rs` tests:
1691+
| "F_CANCELLK"
1692+
| "F_ADD_SEALS"
1693+
| "F_GET_SEALS"
1694+
| "F_SEAL_SEAL"
1695+
| "F_SEAL_SHRINK"
1696+
| "F_SEAL_GROW"
1697+
| "F_SEAL_WRITE" => true,
1698+
1699+
// The `ARPHRD_CAN` is tested in the `linux_if_arp.rs` tests:
1700+
"ARPHRD_CAN" => true,
1701+
16781702
// FIXME: deprecated: not available in any header
16791703
// See: https://github.com/rust-lang/libc/issues/1356
16801704
"ENOATTR" => true,
@@ -1692,6 +1716,7 @@ fn test_android(target: &str) {
16921716

16931717
// FIXME: conflicts with standard C headers and is tested in
16941718
// `linux_termios.rs` below:
1719+
"BOTHER" => true,
16951720
"IBSHIFT" => true,
16961721
"TCGETS2" | "TCSETS2" | "TCSETSW2" | "TCSETSF2" => true,
16971722

0 commit comments

Comments
 (0)