Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Update cc-rs to 1.2.4 #134419

Closed
wants to merge 1 commit into from
Closed

Update cc-rs to 1.2.4 #134419

wants to merge 1 commit into from

Conversation

dlon
Copy link
Contributor

@dlon dlon commented Dec 17, 2024 •
edited
Loading

This fixes the issue of the wrong build tools being used when cross-compiling from msvc. Fixes #133794.

@rustbot
Copy link
Collaborator

rustbot commented Dec 17, 2024

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Mark-Simulacrum (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot
Copy link
Collaborator

rustbot commented Dec 17, 2024

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 17, 2024
@jieyouxu
Copy link
Member

Thanks!

r? jieyouxu
@bors r+ rollup=never (cc bump, may have unexpected failures)

@bors
Copy link
Contributor

bors commented Dec 17, 2024

📌 Commit ce79e60 has been approved by jieyouxu

It is now in the queue for this repository.

@rustbot rustbot assigned jieyouxu and unassigned Mark-Simulacrum Dec 17, 2024
@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 Dec 17, 2024
@jieyouxu
Copy link
Member

Hang on, need to double-check whats happening with cc bumps, we have like 3 different cc bumps now.

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 17, 2024
@jieyouxu
Copy link
Member

Hm I can't find the other one, so let's see what fails.

@bors r+

@bors
Copy link
Contributor

bors commented Dec 17, 2024

📌 Commit ce79e60 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 17, 2024
@klensy klensy mentioned this pull request Dec 17, 2024
Merged
@clubby789
Copy link
Contributor

I've verified locally that cc >= 1.2.2 breaks our build so
@bors r-
Once rust-lang/cc-rs#1322 is out we can update

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 17, 2024
@clubby789 clubby789 added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 17, 2024
@bors
Copy link
Contributor

bors commented Dec 18, 2024

☔ The latest upstream changes (presumably #134425) made this pull request unmergeable. Please resolve the merge conflicts.

@faern faern mentioned this pull request Dec 19, 2024
Merged
@jieyouxu jieyouxu mentioned this pull request Dec 19, 2024
Merged
@jieyouxu
Copy link
Member

Hi @dlon, I'm going to close this PR in favor of a compiler cc 1.2.5 bump in #134505 (with attribution to you as well). Thanks for the PR!

@jieyouxu jieyouxu closed this Dec 19, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 21, 2024
@bors
Auto merge of rust-lang#134505 - jieyouxu:boop-compiler-cc, r=clubby7…
4c40c89 
…89,jieyouxu

Bump compiler `cc` to 1.2.5

- `cc` 1.2.4 contains a fix to address [rustc uses wrong build tools when compiling from MSVC rust-lang#133794](rust-lang#133794). See <https://github.com/rust-lang/cc-rs/releases/tag/cc-v1.2.4>.
- `cc` 1.2.5 contains a fix to also check linking when testing if certain compiler flags are supported, which fixed an issue that was causing previous compiler `cc` bumps to fail. See <https://github.com/rust-lang/cc-rs/releases/tag/cc-v1.2.5>.

Supersedes rust-lang#134419.
Fixes rust-lang#133794.

r? `@clubby789`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jieyouxu jieyouxu

Labels
S-blocked Status: Blocked on something else such as an RFC or other implementation work. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

rustc uses wrong build tools when compiling from MSVC
6 participants
@dlon @rustbot @jieyouxu @bors @clubby789 @Mark-Simulacrum