downgrade-bootstrap-cc.patch 1.5 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. Downgrade bootstrap cc version
  2. In rust v1.85.0, the upgraded cc version causes bootstrap
  3. to fail on custom targets. Downgrading the cc version fixes
  4. the error. This commit is merged with v1.85.1 and the patch
  5. can be dropped when upgraded to it.
  6. Upstream-Status: Backport [https://github.com/rust-lang/rust/pull/137460/commits/e4ca11f87ffca8c63aa56d45b46e62b6acc58bd7]
  7. Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com>
  8. diff --git a/src/bootstrap/Cargo.lock b/src/bootstrap/Cargo.lock
  9. index a47f3af60cb..890e64e2bab 100644
  10. --- a/src/bootstrap/Cargo.lock
  11. +++ b/src/bootstrap/Cargo.lock
  12. @@ -88,9 +88,9 @@ dependencies = [
  13. [[package]]
  14. name = "cc"
  15. -version = "1.2.0"
  16. +version = "1.1.22"
  17. source = "registry+https://github.com/rust-lang/crates.io-index"
  18. -checksum = "1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"
  19. +checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0"
  20. dependencies = [
  21. "shlex",
  22. ]
  23. diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
  24. index ed51862390d..2c1d85b01e6 100644
  25. --- a/src/bootstrap/Cargo.toml
  26. +++ b/src/bootstrap/Cargo.toml
  27. @@ -37,7 +37,9 @@ test = false
  28. # Most of the time updating these dependencies requires modifications to the
  29. # bootstrap codebase(e.g., https://github.com/rust-lang/rust/issues/124565);
  30. # otherwise, some targets will fail. That's why these dependencies are explicitly pinned.
  31. -cc = "=1.2.0"
  32. +#
  33. +# Do not upgrade this crate unless https://github.com/rust-lang/cc-rs/issues/1317 is fixed.
  34. +cc = "=1.1.22"
  35. cmake = "=0.1.48"
  36. build_helper = { path = "../build_helper" }