From c72b432396a0fc27d6f4ef9e7a974c90894dd047 Mon Sep 17 00:00:00 2001 From: James Farrell Date: Thu, 14 Mar 2024 18:03:07 +0000 Subject: [PATCH] Update version of cc crate Reason: In order to build the Windows version of the Rust toolchain for the Android platform, the following patch to the cc is crate is required to avoid incorrectly determining that we are building with the Android NDK: https://github.com/rust-lang/cc-rs/commit/57853c4bf8a89a0f4c9137eb367ac580305c6919 This patch is present in version 1.0.80 and newer versions of the cc crate. The rustc source distribution currently has 3 different versions of cc in the vendor directory, only one of which has the necessary fix. We (the Android Rust toolchain) are currently maintaining local patches to upgrade the cc crate dependency versions, which we would like to upstream. --- src/bootstrap/Cargo.lock | 7 +++++-- src/bootstrap/Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/bootstrap/Cargo.lock b/src/bootstrap/Cargo.lock index e2c90cc8c8474..74860452a24fe 100644 --- a/src/bootstrap/Cargo.lock +++ b/src/bootstrap/Cargo.lock @@ -98,9 +98,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.73" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "51f1226cd9da55587234753d1245dd5b132343ea240f26b6a9003d68706141ba" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml index b232885c590ee..5da0bf7b0de71 100644 --- a/src/bootstrap/Cargo.toml +++ b/src/bootstrap/Cargo.toml @@ -36,7 +36,7 @@ test = false # Most of the time updating these dependencies requires modifications # to the bootstrap codebase; otherwise, some targets will fail. That's # why these dependencies are explicitly pinned. -cc = "=1.0.73" +cc = "=1.0.80" cmake = "=0.1.48" build_helper = { path = "../tools/build_helper" }