From e228df915d64451ea6634c53e0647b4cf953c18d Mon Sep 17 00:00:00 2001
From: Yuki Okushi <huyuumi.dev@gmail.com>
Date: Sat, 17 Oct 2020 02:49:18 +0900
Subject: [PATCH] Pin `cc` crate to fix AArch64-Android CI
---
ci/android-install-ndk.sh | 6 +++---
ci/docker/aarch64-linux-android/Dockerfile | 2 +-
libc-test/Cargo.toml | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ci/android-install-ndk.sh b/ci/android-install-ndk.sh
index 7bc655ef..46356512 100644
--- a/ci/android-install-ndk.sh
+++ b/ci/android-install-ndk.sh
@@ -9,15 +9,15 @@ unzip -q ${NDK}-linux-x86_64.zip
case "$1" in
arm)
arch=arm
- api=24
+ api=28
;;
armv7)
arch=arm
- api=24
+ api=28
;;
aarch64)
arch=arm64
- api=24
+ api=28
;;
i686)
arch=x86
diff --git a/ci/docker/aarch64-linux-android/Dockerfile b/ci/docker/aarch64-linux-android/Dockerfile
index 2c816c24..d5396a32 100644
--- a/ci/docker/aarch64-linux-android/Dockerfile
+++ b/ci/docker/aarch64-linux-android/Dockerfile
@@ -29,7 +29,7 @@ RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linu
RUN ls -a /android/sdk/platform-tools
ENV PATH=$PATH:/rust/bin \
- CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android-gcc \
+ CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android28-clang \
CARGO_TARGET_AARCH64_LINUX_ANDROID_RUNNER=/tmp/runtest \
HOME=/tmp
diff --git a/libc-test/Cargo.toml b/libc-test/Cargo.toml
index 00e0b540..ae5bfe39 100644
--- a/libc-test/Cargo.toml
+++ b/libc-test/Cargo.toml
@@ -9,7 +9,7 @@ path = ".."
default-features = false
[build-dependencies]
-cc = "1.0"
+cc = "=1.0.52"
# FIXME: Use fork ctest until the maintainer gets back.
ctest2 = "0.3"
--
GitLab