Skip to content

[beta] Revert "Build shared LLVM lib for windows-gnullvm"#156962

Merged
rust-bors[bot] merged 1 commit into
rust-lang:betafrom
mati865:revert-gnullvm-link-shared-beta
Jun 12, 2026
Merged

[beta] Revert "Build shared LLVM lib for windows-gnullvm"#156962
rust-bors[bot] merged 1 commit into
rust-lang:betafrom
mati865:revert-gnullvm-link-shared-beta

Conversation

@mati865

@mati865 mati865 commented May 26, 2026

Copy link
Copy Markdown
Member

This reverts commit 1d1280a.

Reapply #155285 to the new beta because #156229 missed the train by a couple of hours.

@rustbot

rustbot commented May 26, 2026

Copy link
Copy Markdown
Collaborator

Warning

If you are changing how CI LLVM is built or linked, make sure to bump
src/bootstrap/download-ci-llvm-stamp.

cc @jieyouxu

@rustbot rustbot added A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels May 26, 2026
@rustbot

rustbot commented May 26, 2026

Copy link
Copy Markdown
Collaborator

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

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: infra-ci
  • infra-ci expanded to Kobzol, Mark-Simulacrum, jdno, jieyouxu, marcoieni
  • Random selection from Mark-Simulacrum, jdno, marcoieni

@rustbot

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@mati865 mati865 changed the title Revert "Build shared LLVM lib for windows-gnullvm" [beta] Revert "Build shared LLVM lib for windows-gnullvm" May 26, 2026
@mati865

mati865 commented May 26, 2026 •
edited
Loading

Copy link
Copy Markdown
Member Author

I edited the title, but perhaps it got lost when I changed the target branch because it caused the page to reload (although the modified description remained modified).

@jieyouxu jieyouxu added the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 27, 2026
@Mark-Simulacrum

Mark-Simulacrum commented Jun 7, 2026

Copy link
Copy Markdown
Member

Can you rebase this? I assume that should fix the CI.

@jieyouxu @mati865
Revert "Build shared LLVM lib for windows-gnullvm"
58141b2 
This reverts commit 1d1280a.

Looks like this causes problems with certain LLVM bin tools not finding
`libLLVM` on `*-windows-gnullvm`. This commit is a _minimal_ revert to
return us to known state to alleviate time pressure to investigate.
@mati865 mati865 force-pushed the revert-gnullvm-link-shared-beta branch from 25380ca to 58141b2 Compare June 10, 2026 10:13
@rustbot

rustbot commented Jun 10, 2026

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different beta commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@mati865

mati865 commented Jun 10, 2026

Copy link
Copy Markdown
Member Author

Can you rebase this? I assume that should fix the CI.

Sorry, that comment slipped under my radar. CI is green after the rebase.

@Mark-Simulacrum

Mark-Simulacrum commented Jun 11, 2026

Copy link
Copy Markdown
Member

@bors r+ rollup=never

@rust-bors

rust-bors Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 58141b2 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Jun 11, 2026
@jieyouxu jieyouxu added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jun 11, 2026
@jieyouxu

jieyouxu commented Jun 11, 2026

Copy link
Copy Markdown
Member

(Tagging as accepted since it's essentially a re-apply of a previously accepted beta-backported revert.)

@cuviper cuviper mentioned this pull request Jun 11, 2026
Merged
@cuviper

cuviper commented Jun 11, 2026

Copy link
Copy Markdown
Member

I've added this along with other backports in #157787 so we can save CI time. :)

@bors r-

@rust-bors rust-bors Bot 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 Jun 11, 2026
@rust-bors

rust-bors Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved.

View changes since this unapproval

@cuviper cuviper added this to the 1.97.0 milestone Jun 12, 2026
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 12, 2026
rust-bors Bot pushed a commit that referenced this pull request Jun 12, 2026
@bors
Auto merge of #157787 - cuviper:beta-next, r=cuviper
36645eb 
[beta] backports

- Revert "Build shared LLVM lib for windows-gnullvm" #156962
- Allow building the source tarballs while offline #157014
- resolve: Partially revert "Remove a special case for dummy imports" #157719
- resolve: Remove exported imports from `maybe_unused_trait_imports` #157713
- [beta-1.97] Update cargo submodule #157792

r? cuviper
@rust-bors rust-bors Bot merged commit 58141b2 into rust-lang:beta Jun 12, 2026
11 checks passed
@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 12, 2026
@mati865 mati865 deleted the revert-gnullvm-link-shared-beta branch June 21, 2026 22:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels

A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc beta-accepted Accepted for backporting to the compiler in the beta channel. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.97.0

Development

Successfully merging this pull request may close these issues.

6 participants

@mati865 @rustbot @rust-log-analyzer @Mark-Simulacrum @jieyouxu @cuviper