From b4f8191689119cd63908d18616e1b8cbc923999c Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Sat, 24 Oct 2020 02:04:18 +0900 Subject: [PATCH] Unpin the `cc` crate version --- ci/docker/aarch64-linux-android/Dockerfile | 1 + ci/docker/arm-linux-androideabi/Dockerfile | 1 + ci/docker/i686-linux-android/Dockerfile | 1 + libc-test/Cargo.toml | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/docker/aarch64-linux-android/Dockerfile b/ci/docker/aarch64-linux-android/Dockerfile index 56685c5478231..0aa99eeea10ae 100644 --- a/ci/docker/aarch64-linux-android/Dockerfile +++ b/ci/docker/aarch64-linux-android/Dockerfile @@ -30,6 +30,7 @@ RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linu ENV PATH=$PATH:/rust/bin \ CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android28-clang \ CARGO_TARGET_AARCH64_LINUX_ANDROID_RUNNER=/tmp/runtest \ + CC_aarch64_linux_android=aarch64-linux-android28-clang \ HOME=/tmp ADD runtest-android.rs /tmp/runtest.rs diff --git a/ci/docker/arm-linux-androideabi/Dockerfile b/ci/docker/arm-linux-androideabi/Dockerfile index cee5882d91acb..e5cc79d87fd1b 100644 --- a/ci/docker/arm-linux-androideabi/Dockerfile +++ b/ci/docker/arm-linux-androideabi/Dockerfile @@ -30,6 +30,7 @@ RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linu ENV PATH=$PATH:/rust/bin \ CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc \ CARGO_TARGET_ARM_LINUX_ANDROIDEABI_RUNNER=/tmp/runtest \ + CC_arm_linux_androideabi=arm-linux-androideabi-gcc \ HOME=/tmp ADD runtest-android.rs /tmp/runtest.rs diff --git a/ci/docker/i686-linux-android/Dockerfile b/ci/docker/i686-linux-android/Dockerfile index 050be4153436c..62a379b3cf8bc 100644 --- a/ci/docker/i686-linux-android/Dockerfile +++ b/ci/docker/i686-linux-android/Dockerfile @@ -30,6 +30,7 @@ RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linu ENV PATH=$PATH:/rust/bin \ CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android-gcc \ CARGO_TARGET_I686_LINUX_ANDROID_RUNNER=/tmp/runtest \ + CC_i686_linux_android=i686-linux-android-gcc \ HOME=/tmp ADD runtest-android.rs /tmp/runtest.rs diff --git a/libc-test/Cargo.toml b/libc-test/Cargo.toml index ae5bfe39330a7..75ae60466dd1a 100644 --- a/libc-test/Cargo.toml +++ b/libc-test/Cargo.toml @@ -9,7 +9,7 @@ path = ".." default-features = false [build-dependencies] -cc = "=1.0.52" +cc = "1.0.61" # FIXME: Use fork ctest until the maintainer gets back. ctest2 = "0.3"