squiid/rust-libc
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Auto merge of #2684 - Amanieu:fix-android-ci, r=Amanieu

Browse source 
Fix multiple symbol definitions on Android CI

The breakage was caused by https://github.com/rust-lang/rust/pull/83822 which removed `-Wl,--allow-multiple-definition` from the Android target linker flags.
This commit is contained in:
bors 2022-02-14 14:57:29 +00:00
parent 7cd6a6f629 95c0d08166
commit acd773d4a4
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libc-test/build.rs
View file

@ -1652,6 +1652,9 @@ fn test_android(target: &str) {
// FIXME: `sighandler_t` type is incorrect, see:
// https://github.com/rust-lang/libc/issues/1359
"sighandler_t" => true,
// These are tested in the `linux_elf.rs` file.
"Elf64_Phdr" | "Elf32_Phdr" => true,
_ => false,
}
});
@ -1669,12 +1672,33 @@ fn test_android(target: &str) {
// 'private' type
"prop_info" => true,
// These are tested in the `linux_elf.rs` file.
"Elf64_Phdr" | "Elf32_Phdr" => true,
_ => false,
}
});
cfg.skip_const(move |name| {
match name {
// The IPV6 constants are tested in the `linux_ipv6.rs` tests:
| "IPV6_FLOWINFO"
| "IPV6_FLOWLABEL_MGR"
| "IPV6_FLOWINFO_SEND"
| "IPV6_FLOWINFO_FLOWLABEL"
| "IPV6_FLOWINFO_PRIORITY"
// The F_ fnctl constants are tested in the `linux_fnctl.rs` tests:
| "F_CANCELLK"
| "F_ADD_SEALS"
| "F_GET_SEALS"
| "F_SEAL_SEAL"
| "F_SEAL_SHRINK"
| "F_SEAL_GROW"
| "F_SEAL_WRITE" => true,
// The `ARPHRD_CAN` is tested in the `linux_if_arp.rs` tests:
"ARPHRD_CAN" => true,
// FIXME: deprecated: not available in any header
// See: https://github.com/rust-lang/libc/issues/1356
"ENOATTR" => true,
@ -1692,6 +1716,7 @@ fn test_android(target: &str) {
// FIXME: conflicts with standard C headers and is tested in
// `linux_termios.rs` below:
"BOTHER" => true,
"IBSHIFT" => true,
"TCGETS2" | "TCSETS2" | "TCSETSW2" | "TCSETSF2" => true,