Skip to content

Commit bd4cf96

Browse files
authored
Merge pull request #1769 from JohnTitor/aarch64-android
Re-enable aarch64-linux-android CI
2 parents 174920c + 1528539 commit bd4cf96

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

ci/azure.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ jobs:
3434
displayName: Execute run-docker.sh
3535
strategy:
3636
matrix:
37-
# FIXME: Disabled due to https://github.com/rust-lang/libc/issues/1765
38-
# aarch64-unknown-linux-android:
39-
# TARGET: aarch64-linux-android
37+
aarch64-unknown-linux-android:
38+
TARGET: aarch64-linux-android
4039
aarch64-unknown-linux-gnu:
4140
TARGET: aarch64-unknown-linux-gnu
4241
aarch64-unknown-linux-musl:

libc-test/build.rs

+7
Original file line numberDiff line numberDiff line change
@@ -1355,6 +1355,7 @@ fn test_android(target: &str) {
13551355
t => panic!("unsupported target: {}", t),
13561356
};
13571357
let x86 = target.contains("i686") || target.contains("x86_64");
1358+
let aarch64 = target.contains("aarch64");
13581359

13591360
let mut cfg = ctest_cfg();
13601361
cfg.define("_GNU_SOURCE", None);
@@ -1564,6 +1565,12 @@ fn test_android(target: &str) {
15641565
// test the XSI version below.
15651566
"strerror_r" => true,
15661567

1568+
// FIXME: Somehow we cannot find these fns on aarch64.
1569+
// https://github.com/rust-lang/libc/issues/1765
1570+
"lockf" | "preadv64" | "pwritev64" | "openpty" |
1571+
"forkpty" | "login_tty" | "getifaddrs" | "freeifaddrs" |
1572+
"sethostname" | "getgrgid_r" | "getgrnam_r" if aarch64 => true,
1573+
15671574
_ => false,
15681575
}
15691576
});

0 commit comments

Comments
 (0)