diff options
| author | León Orell Valerian Liehr <me@fmease.dev> | 2025-02-25 13:32:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-25 13:32:54 +0100 |
| commit | 849a60a7620d5ce48130a9c37421ba3512867dcf (patch) | |
| tree | d1b2f3ab1a6ba97a493f99a3e9b390a8c2edc88e /src/bootstrap | |
| parent | da31d840def341dbda62f90fde91002df9102e54 (diff) | |
| parent | e4ca11f87ffca8c63aa56d45b46e62b6acc58bd7 (diff) | |
| download | rust-849a60a7620d5ce48130a9c37421ba3512867dcf.tar.gz rust-849a60a7620d5ce48130a9c37421ba3512867dcf.zip | |
Rollup merge of #137460 - onur-ozkan:downgrade-cc, r=jieyouxu
downgrade bootstrap `cc` Current `cc` version causing bootstrap to fail on custom targets. See https://github.com/rust-lang/cc-rs/issues/1317 for more context. Fixes (after beta and stable backports): https://github.com/rust-lang/rust/issues/137064 and https://github.com/rust-lang/rust/issues/135271
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/Cargo.lock | 4 | ||||
| -rw-r--r-- | src/bootstrap/Cargo.toml | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/bootstrap/Cargo.lock b/src/bootstrap/Cargo.lock index a47f3af60cb..890e64e2bab 100644 --- a/src/bootstrap/Cargo.lock +++ b/src/bootstrap/Cargo.lock @@ -88,9 +88,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.0" +version = "1.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8" +checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0" dependencies = [ "shlex", ] diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml index ed51862390d..2c1d85b01e6 100644 --- a/src/bootstrap/Cargo.toml +++ b/src/bootstrap/Cargo.toml @@ -37,7 +37,9 @@ test = false # Most of the time updating these dependencies requires modifications to the # bootstrap codebase(e.g., https://github.com/rust-lang/rust/issues/124565); # otherwise, some targets will fail. That's why these dependencies are explicitly pinned. -cc = "=1.2.0" +# +# Do not upgrade this crate unless https://github.com/rust-lang/cc-rs/issues/1317 is fixed. +cc = "=1.1.22" cmake = "=0.1.48" build_helper = { path = "../build_helper" } |