Skip to content

Commit 80b3a51

Browse files
committed
Auto merge of #1954 - JohnTitor:newer-cc, r=JohnTitor
Unpin the `cc` crate version Fixes #1933
2 parents f18c583 + b4f8191 commit 80b3a51

File tree

4 files changed

+4
-1
lines changed

4 files changed

+4
-1
lines changed

ci/docker/aarch64-linux-android/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linu
3030
ENV PATH=$PATH:/rust/bin \
3131
CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android28-clang \
3232
CARGO_TARGET_AARCH64_LINUX_ANDROID_RUNNER=/tmp/runtest \
33+
CC_aarch64_linux_android=aarch64-linux-android28-clang \
3334
HOME=/tmp
3435

3536
ADD runtest-android.rs /tmp/runtest.rs

ci/docker/arm-linux-androideabi/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linu
3030
ENV PATH=$PATH:/rust/bin \
3131
CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc \
3232
CARGO_TARGET_ARM_LINUX_ANDROIDEABI_RUNNER=/tmp/runtest \
33+
CC_arm_linux_androideabi=arm-linux-androideabi-gcc \
3334
HOME=/tmp
3435

3536
ADD runtest-android.rs /tmp/runtest.rs

ci/docker/i686-linux-android/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linu
3030
ENV PATH=$PATH:/rust/bin \
3131
CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android-gcc \
3232
CARGO_TARGET_I686_LINUX_ANDROID_RUNNER=/tmp/runtest \
33+
CC_i686_linux_android=i686-linux-android-gcc \
3334
HOME=/tmp
3435

3536
ADD runtest-android.rs /tmp/runtest.rs

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.52"
12+
cc = "1.0.61"
1313
# FIXME: Use fork ctest until the maintainer gets back.
1414
ctest2 = "0.3"
1515

0 commit comments

Comments
 (0)