Skip to content

downgrade bootstrap cc #137460

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Feb 25, 2025
Merged

downgrade bootstrap cc #137460

merged 1 commit into from
Feb 25, 2025

Conversation

onur-ozkan
Copy link
Member

@onur-ozkan onur-ozkan commented Feb 23, 2025

Current cc version causing bootstrap to fail on custom targets. See rust-lang/cc-rs#1317 for more context.

Fixes (after beta and stable backports): #137064 and #135271

Signed-off-by: onur-ozkan <work@onurozkan.dev>
@rustbot
Copy link
Collaborator

rustbot commented Feb 23, 2025

r? @jieyouxu

rustbot has assigned @jieyouxu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Feb 23, 2025
@jieyouxu
Copy link
Member

Yeah, this is a reasonable mitigation in the meantime. Thanks!

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 23, 2025

📌 Commit e4ca11f has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 23, 2025
@stefson
Copy link

stefson commented Feb 23, 2025

If this sticks, it will be super helpfull if you backport this further into beta and stable.

@onur-ozkan
Copy link
Member Author

If this sticks, it will be super helpfull if you backport this further into beta and stable.

That's the plan, yeah.

@jieyouxu jieyouxu added beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Feb 23, 2025
@jieyouxu
Copy link
Member

I modified the PR description to not have this PR auto-close the linked issues, since they won't be fixed on stable/beta without corresponding backports landing.

@onur-ozkan
Copy link
Member Author

@rustbot label +stable-accepted +beta-accepted

See the team decision.

@rustbot rustbot added beta-accepted Accepted for backporting to the compiler in the beta channel. stable-accepted Accepted for backporting to the compiler in the stable channel. labels Feb 24, 2025
fmease added a commit to fmease/rust that referenced this pull request Feb 25, 2025
downgrade bootstrap `cc`

Current `cc` version causing bootstrap to fail on custom targets. See rust-lang/cc-rs#1317 for more context.

Fixes (after beta and stable backports): rust-lang#137064 and rust-lang#135271
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 25, 2025
Rollup of 6 pull requests

Successful merges:

 - rust-lang#135480 (Don't require method impls for methods with `Self:Sized` bounds for impls for unsized types)
 - rust-lang#137360 (Use `as_chunks` in `analyze_source_file_sse2`)
 - rust-lang#137460 (downgrade bootstrap `cc`)
 - rust-lang#137515 (Update `compiler-builtins` to 0.1.148)
 - rust-lang#137522 (use stage 2 on cargo and clippy tests when possible)
 - rust-lang#137597 (Revert accidental cargo submodule update)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 849a60a into rust-lang:master Feb 25, 2025
6 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Feb 25, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 25, 2025
Rollup merge of rust-lang#137460 - onur-ozkan:downgrade-cc, r=jieyouxu

downgrade bootstrap `cc`

Current `cc` version causing bootstrap to fail on custom targets. See rust-lang/cc-rs#1317 for more context.

Fixes (after beta and stable backports): rust-lang#137064 and rust-lang#135271
@onur-ozkan onur-ozkan deleted the downgrade-cc branch February 25, 2025 21:59
@cuviper cuviper mentioned this pull request Feb 27, 2025
@cuviper cuviper modified the milestones: 1.87.0, 1.86.0 Feb 27, 2025
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 27, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 2, 2025
[beta] backports

- Pass vendored sources from bootstrap to generate-copyright rust-lang#137020
- Fix `-win7-windows-msvc` target since 26eeac1* rust-lang#137270
- skip submodule updating logics on tarballs rust-lang#137338
- Improve behavior of `IF_LET_RESCOPE` around temporaries and place expressions rust-lang#137444
- downgrade bootstrap `cc` rust-lang#137460
- Remove latest Windows SDK from 32-bit CI rust-lang#137753
- [beta-1.86] Ensure we can package directories ending with '.rs' (rust-lang/cargo#15248) rust-lang#137842

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 14, 2025
[stable] Release 1.85.1

- [Fix the doctest-merging feature of the 2024 Edition.](rust-lang#137899)
- [Relax some `target_feature` checks when generating docs.](rust-lang#137632)
  - DRAFT NOTE: this is not formally `stable-accepted` yet. It also required some fixup to deal with differences in the `Stability` system, but I think it should have the same effect, limited to `rustdoc` execution.
- [Fix errors in `fs::rename` on Windows 1607.](rust-lang#137528)
- [Downgrade bootstrap `cc` to fix custom targets.](rust-lang#137460)
- [Skip submodule updates when building Rust from a source tarball.](rust-lang#137338)

cc `@rust-lang/release`
r? cuviper

try-job: dist-x86_64-linux
try-job: dist-i686-msvc
try-job: x86_64-rust-for-linux
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 15, 2025
[stable] Release 1.85.1

- [Fix the doctest-merging feature of the 2024 Edition.](rust-lang#137899)
- [Relax some `target_feature` checks when generating docs.](rust-lang#137632)
  - DRAFT NOTE: this is not formally `stable-accepted` yet. It also required some fixup to deal with differences in the `Stability` system, but I think it should have the same effect, limited to `rustdoc` execution.
- [Fix errors in `fs::rename` on Windows 1607.](rust-lang#137528)
- [Downgrade bootstrap `cc` to fix custom targets.](rust-lang#137460)
- [Skip submodule updates when building Rust from a source tarball.](rust-lang#137338)

cc `@rust-lang/release`
r? cuviper

try-job: dist-x86_64-linux
try-job: dist-i686-msvc
try-job: x86_64-rust-for-linux
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 15, 2025
[stable] Release 1.85.1

- [Fix the doctest-merging feature of the 2024 Edition.](rust-lang#137899)
- [Relax some `target_feature` checks when generating docs.](rust-lang#137632)
  - DRAFT NOTE: this is not formally `stable-accepted` yet. It also required some fixup to deal with differences in the `Stability` system, but I think it should have the same effect, limited to `rustdoc` execution.
- [Fix errors in `fs::rename` on Windows 1607.](rust-lang#137528)
- [Downgrade bootstrap `cc` to fix custom targets.](rust-lang#137460)
- [Skip submodule updates when building Rust from a source tarball.](rust-lang#137338)

cc `@rust-lang/release`
r? cuviper

try-job: dist-x86_64-linux
try-job: dist-i686-msvc
try-job: i686-msvc
try-job: x86_64-rust-for-linux
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 15, 2025
[stable] Release 1.85.1

- [Fix the doctest-merging feature of the 2024 Edition.](rust-lang#137899)
- [Relax some `target_feature` checks when generating docs.](rust-lang#137632)
  - DRAFT NOTE: this is not formally `stable-accepted` yet. It also required some fixup to deal with differences in the `Stability` system, but I think it should have the same effect, limited to `rustdoc` execution.
- [Fix errors in `fs::rename` on Windows 1607.](rust-lang#137528)
- [Downgrade bootstrap `cc` to fix custom targets.](rust-lang#137460)
- [Skip submodule updates when building Rust from a source tarball.](rust-lang#137338)

cc `@rust-lang/release`
r? cuviper

try-job: dist-x86_64-linux
try-job: dist-i686-msvc
try-job: i686-msvc
try-job: x86_64-rust-for-linux
@cuviper cuviper removed the stable-nominated Nominated for backporting to the compiler in the stable channel. label Mar 15, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 15, 2025
[stable] Release 1.85.1

- [Fix the doctest-merging feature of the 2024 Edition.](rust-lang#137899)
- [Relax some `target_feature` checks when generating docs.](rust-lang#137632)
- [Fix errors in `std::fs::rename` on Windows 1607.](rust-lang#137528)
- [Downgrade bootstrap `cc` to fix custom targets.](rust-lang#137460)
- [Skip submodule updates when building Rust from a source tarball.](rust-lang#137338)

Added backports to fix CI:

- Remove latest Windows SDK from 32-bit CI rust-lang#137753
- Do not install rustup on Rust for Linux job rust-lang#137947

cc `@rust-lang/release`
r? cuviper
@cuviper cuviper modified the milestones: 1.86.0, 1.85.1 Mar 15, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 21, 2025
…try>

Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54

The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.

See [the changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) for exact details on what has changed here.

r? jieyouxu who tried this last in rust-lang#137022.
`@rustbot` label T-bootstrap
try-job: dist-apple-various
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 22, 2025
Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54

The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.

See [the changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) for exact details on what has changed here.

r? jieyouxu who tried this last in rust-lang#137022.
`@rustbot` label T-bootstrap
try-job: dist-apple-various
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 24, 2025
…try>

Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54

The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.

See [the changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) for exact details on what has changed here.

r? jieyouxu who tried this last in rust-lang#137022.
`@rustbot` label T-bootstrap
try-job: dist-apple-various
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 24, 2025
…try>

Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54

The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.

See [the `cc-rs` changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) and [the `cmake-rs` changelog](https://github.com/rust-lang/cmake-rs/blob/fd56c5a6b4ecda8815c863eb5b12d7b3f0391197/CHANGELOG.md) for details on what has changed here.

r? jieyouxu who tried this last in rust-lang#137022.
`@rustbot` label T-bootstrap
try-job: dist-apple-various
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 25, 2025
…try>

Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54

The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.

See [the `cc-rs` changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) and [the `cmake-rs` changelog](https://github.com/rust-lang/cmake-rs/blob/fd56c5a6b4ecda8815c863eb5b12d7b3f0391197/CHANGELOG.md) for details on what has changed here.

r? jieyouxu who tried this last in rust-lang#137022.
`@rustbot` label T-bootstrap
try-job: *apple*
tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request Mar 25, 2025
This MR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [rust](https://github.com/rust-lang/rust) | patch | `1.85.0` -> `1.85.1` |

MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot).

**Proposed changes to behavior should be submitted there as MRs.**

---

### Release Notes

<details>
<summary>rust-lang/rust (rust)</summary>

### [`v1.85.1`](https://github.com/rust-lang/rust/blob/HEAD/RELEASES.md#Version-1851-2025-03-18)

[Compare Source](rust-lang/rust@1.85.0...1.85.1)

\==========================

<a id="1.85.1"></a>

-   [Fix the doctest-merging feature of the 2024 Edition.](rust-lang/rust#137899)
-   [Relax some `target_feature` checks when generating docs.](rust-lang/rust#137632)
-   [Fix errors in `std::fs::rename` on Windows 10, version 1607.](rust-lang/rust#137528)
-   [Downgrade bootstrap `cc` to fix custom targets.](rust-lang/rust#137460)
-   [Skip submodule updates when building Rust from a source tarball.](rust-lang/rust#137338)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever MR is behind base branch, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this MR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box

---

This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4yMTIuMiIsInVwZGF0ZWRJblZlciI6IjM5LjIxMi4yIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
bmwiedemann pushed a commit to bmwiedemann/openSUSE that referenced this pull request Mar 26, 2025
https://build.opensuse.org/request/show/1255785
by user xiaoguang_wang + anag+factory
Version 1.85.1 (2025-03-18)
==========================
- [Fix the doctest-merging feature of the 2024 Edition.](rust-lang/rust#137899)
- [Relax some `target_feature` checks when generating docs.](rust-lang/rust#137632)
- [Fix errors in `std::fs::rename` on Windows 10, version 1607.](rust-lang/rust#137528)
- [Downgrade bootstrap `cc` to fix custom targets.](rust-lang/rust#137460)
- [Skip submodule updates when building Rust from a source tarball.](rust-lang/rust#137338)
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 29, 2025
…ieyouxu

Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54

The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.

See [the `cc-rs` changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) and [the `cmake-rs` changelog](https://github.com/rust-lang/cmake-rs/blob/fd56c5a6b4ecda8815c863eb5b12d7b3f0391197/CHANGELOG.md) for details on what has changed here.

r? jieyouxu who tried this last in rust-lang#137022.
`@rustbot` label T-bootstrap
try-job: *apple*
github-merge-queue bot pushed a commit to rust-lang/miri that referenced this pull request Apr 2, 2025
Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54

The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang/rust#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.

See [the `cc-rs` changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) and [the `cmake-rs` changelog](https://github.com/rust-lang/cmake-rs/blob/fd56c5a6b4ecda8815c863eb5b12d7b3f0391197/CHANGELOG.md) for details on what has changed here.

r? jieyouxu who tried this last in rust-lang/rust#137022.
`@rustbot` label T-bootstrap
try-job: *apple*
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. stable-accepted Accepted for backporting to the compiler in the stable channel. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants