Skip to content

Commit

Permalink
Auto merge of #2684 - Amanieu:fix-android-ci, r=Amanieu
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Feb 14, 2022
2 parents 7cd6a6f + ff20d04 commit 5f8e88a
Showing 1 changed file with 33 additions and 0 deletions.
33 changes: 33 additions & 0 deletions libc-test/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
});
Expand All @@ -1669,12 +1672,42 @@ 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,

// FIXME: conflicts with glibc headers and is tested in
// `linux_termios.rs` below:
| "BOTHER"
| "IBSHIFT"
| "TCGETS2"
| "TCSETS2"
| "TCSETSW2"
| "TCSETSF2" => 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,
Expand Down

0 comments on commit 5f8e88a

Please sign in to comment.