Skip to content

Bump compiler cc#134869

Merged
bors merged 1 commit intorust-lang:masterfrom
clubby789:cc-bump
Dec 29, 2024
Merged

Bump compiler cc#134869
bors merged 1 commit intorust-lang:masterfrom
clubby789:cc-bump

Conversation

@clubby789
Copy link
Contributor

@clubby789 clubby789 commented Dec 29, 2024 •
edited
Loading

Fixes #134657
Pulls in rust-lang/cc-rs#1330

try-job: x86_64-msvc

@rustbot
Copy link
Collaborator

rustbot commented Dec 29, 2024

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
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

@clubby789
Copy link
Contributor Author

clubby789 commented Dec 29, 2024

@bors try

@rustbot
Copy link
Collaborator

rustbot commented Dec 29, 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 29, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 29, 2024
@bors
Auto merge of rust-lang#134869 - clubby789:cc-bump, r=<try>
7805c92 
Bump compiler cc

Fixes rust-lang#134657
Pulls in rust-lang#134657

try-job: x86_64-msvc
@bors
Copy link
Collaborator

bors commented Dec 29, 2024

⌛ Trying commit 8c8fed7 with merge 7805c92...

@bors
Copy link
Collaborator

bors commented Dec 29, 2024

☀️ Try build successful - checks-actions
Build commit: 7805c92 (7805c9291ba3f9f684bec1de4e7f27ce1d0961db)

@clubby789
Copy link
Contributor Author

clubby789 commented Dec 29, 2024

I don't see the warning in the log 🙂 cc @jieyouxu does this resolve it for you on your system?

@jieyouxu jieyouxu assigned jieyouxu and unassigned Mark-Simulacrum Dec 29, 2024
@jieyouxu
Copy link
Member

jieyouxu commented Dec 29, 2024

@clubby789 I can confirm that I no longer observe the warning on x86_64-pc-windows-msvc natively, thanks!

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 29, 2024

📌 Commit 8c8fed7 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 Dec 29, 2024
@jieyouxu
Copy link
Member

jieyouxu commented Dec 29, 2024 •
edited
Loading

BTW you mean pulling in the fix rust-lang/cc-rs#1330 instead of pulling in the issue right?

@jieyouxu
Copy link
Member

jieyouxu commented Dec 29, 2024

(rollup=always is fine because the only change was the inherit flag fix)

@clubby789
Copy link
Contributor Author

clubby789 commented Dec 29, 2024

Indeed - fixed, thanks

Zalathar added a commit to Zalathar/rust that referenced this pull request Dec 29, 2024
@Zalathar
Rollup merge of rust-lang#134869 - clubby789:cc-bump, r=jieyouxu
7768c39 
Bump compiler cc

Fixes rust-lang#134657
Pulls in rust-lang/cc-rs#1330

try-job: x86_64-msvc
This was referenced Dec 29, 2024
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 29, 2024
@bors
Auto merge of rust-lang#134887 - Zalathar:rollup-ghpz7oy, r=Zalathar
64feb9b 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#134799 (nits: Cleanups in `librustdoc::clean`)
 - rust-lang#134851 (docs: inline `alloc::ffi::c_str` types to `alloc::ffi`)
 - rust-lang#134869 (Bump compiler cc)
 - rust-lang#134876 (bootstrap: Consolidate the macros for declaring compiletest test suites)
 - rust-lang#134883 (bootstrap: Fix `./x check bootstrap` by moving `shared_helpers::tests`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ea2851b into rust-lang:master Dec 29, 2024
@rustbot rustbot added this to the 1.85.0 milestone Dec 29, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 29, 2024
@rust-timer
Unrolled build for rust-lang#134869
b05a377 
Rollup merge of rust-lang#134869 - clubby789:cc-bump, r=jieyouxu

Bump compiler cc

Fixes rust-lang#134657
Pulls in rust-lang/cc-rs#1330

try-job: x86_64-msvc
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-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.85.0

Development

Successfully merging this pull request may close these issues.

x86_64 msvc: warning: rustc_llvm@0.0.0: Inherited flag "/Oy-" is not supported by the currently used CC

5 participants

@clubby789 @rustbot @bors @jieyouxu @Mark-Simulacrum