Skip to content

Commit e228df9

Browse files
committed
Pin cc crate to fix AArch64-Android CI
1 parent c1b25a5 commit e228df9

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

ci/android-install-ndk.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ unzip -q ${NDK}-linux-x86_64.zip
99
case "$1" in
1010
arm)
1111
arch=arm
12-
api=24
12+
api=28
1313
;;
1414
armv7)
1515
arch=arm
16-
api=24
16+
api=28
1717
;;
1818
aarch64)
1919
arch=arm64
20-
api=24
20+
api=28
2121
;;
2222
i686)
2323
arch=x86

ci/docker/aarch64-linux-android/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linu
2929
RUN ls -a /android/sdk/platform-tools
3030

3131
ENV PATH=$PATH:/rust/bin \
32-
CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android-gcc \
32+
CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android28-clang \
3333
CARGO_TARGET_AARCH64_LINUX_ANDROID_RUNNER=/tmp/runtest \
3434
HOME=/tmp
3535

libc-test/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ path = ".."
99
default-features = false
1010

1111
[build-dependencies]
12-
cc = "1.0"
12+
cc = "=1.0.52"
1313
# FIXME: Use fork ctest until the maintainer gets back.
1414
ctest2 = "0.3"
1515

0 commit comments

Comments
 (0)