Auto merge of #1954 - JohnTitor:newer-cc, r=JohnTitor

Unpin the `cc` crate version Fixes #1933
rust-lang · Oct 23, 2020 · 80b3a51 · 80b3a51
2 parents f18c583 + b4f8191
commit 80b3a51
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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"