1234567891011121314151617181920212223242526272829303132333435363738394041 |
- Downgrade bootstrap cc version
- In rust v1.85.0, the upgraded cc version causes bootstrap
- to fail on custom targets. Downgrading the cc version fixes
- the error. This commit is merged with v1.85.1 and the patch
- can be dropped when upgraded to it.
- Upstream-Status: Backport [https://github.com/rust-lang/rust/pull/137460/commits/e4ca11f87ffca8c63aa56d45b46e62b6acc58bd7]
- Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com>
- 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" }
|