From b228d6f40eb57cb245dbafa2c8ca309edf25f06d Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Thu, 21 May 2020 15:26:42 +0900 Subject: [PATCH 1/2] Re-enable aarch64-linux-android CI --- ci/azure.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ci/azure.yml b/ci/azure.yml index f908928935b00..ecdf88d5a56fe 100644 --- a/ci/azure.yml +++ b/ci/azure.yml @@ -34,9 +34,8 @@ jobs: displayName: Execute run-docker.sh strategy: matrix: - # FIXME: Disabled due to https://github.com/rust-lang/libc/issues/1765 - # aarch64-unknown-linux-android: - # TARGET: aarch64-linux-android + aarch64-unknown-linux-android: + TARGET: aarch64-linux-android aarch64-unknown-linux-gnu: TARGET: aarch64-unknown-linux-gnu aarch64-unknown-linux-musl: From 1528539b0ac8e36ba2e5be57e6ef8f4a1937f9ed Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Thu, 21 May 2020 14:45:59 +0900 Subject: [PATCH 2/2] Ignore fns that have suddenly disappeared on Android CI --- libc-test/build.rs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libc-test/build.rs b/libc-test/build.rs index f4a2f156b2f95..a4645ae36b79c 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -1355,6 +1355,7 @@ fn test_android(target: &str) { t => panic!("unsupported target: {}", t), }; let x86 = target.contains("i686") || target.contains("x86_64"); + let aarch64 = target.contains("aarch64"); let mut cfg = ctest_cfg(); cfg.define("_GNU_SOURCE", None); @@ -1564,6 +1565,12 @@ fn test_android(target: &str) { // test the XSI version below. "strerror_r" => true, + // FIXME: Somehow we cannot find these fns on aarch64. + // https://github.com/rust-lang/libc/issues/1765 + "lockf" | "preadv64" | "pwritev64" | "openpty" | + "forkpty" | "login_tty" | "getifaddrs" | "freeifaddrs" | + "sethostname" | "getgrgid_r" | "getgrnam_r" if aarch64 => true, + _ => false, } });