Closed
Conversation
Seems like for whatever reason the msys2 installation here is needed for the 32-bit `i686-pc-windows-gnu`, otherwise `rustc` distributed for that target seems to link against the 64-bit libraries or sth. This revert is mostly just to buy time to investigate. This reverts commit e060723, reversing changes made to a9e7b30.
rustbot
added
the
S-waiting-on-review
Member
Author
|
@bors try |
jieyouxu
added
T-compiler
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 10, 2025
Do install msys2 in CI explicitly Reverts rust-lang#136588. Only papers over rust-lang#136795, but the root cause needs to be investigated (likely a bug in how `i686-pc-windows-gnu` is built?). Seems like for whatever reason the msys2 installation here is needed for the 32-bit `i686-pc-windows-gnu` target, otherwise `rustc` distributed for that target seems to link against the 64-bit `libwinpthread-1.dll` and such. This revert is mostly just to buy time to investigate without having to debug why the build logic for the 32-bit windows-gnu target is wrong. This reverts commit e060723, reversing changes made to a9e7b30. r? infra cc `@ChrisDenton` `@mati865` try-job: dist-x86_64-msvc try-job: dist-i686-msvc try-job: dist-aarch64-msvc try-job: dist-i686-mingw try-job: dist-x86_64-mingw try-job: dist-x86_64-msvc-alt
Collaborator
ChrisDenton
reviewed
Feb 10, 2025
jieyouxu
force-pushed
the
revert-msys2-removal
branch
from
e35890a to
f55585e
Compare
Member
|
Oops, sorry wrong button |
Member
Author
|
Inspected the dist toolchain locally with I believe reverting somehow makes us ship the right |
Member
Author
|
This is technically ready for review, but I wouldn't be opposed to close this in favor of somehow fixing the This PR is only opened as a safety net. |
rustbot
added
S-waiting-on-review
Member
|
I may have a fix in #136815 but it still needs to be tested. EDIT: tested, and it works! |
Member
Author
|
Since #136815 seems to work, closing in favor of that. |
workingjubilee
added
the
O-x86_32
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reverts #136588.
Only papers over #136795, but the root cause would still need to be investigated (likely a bug in how
i686-pc-windows-gnuis built?).Seems like for whatever reason the msys2 installation here is needed for the 32-bit
i686-pc-windows-gnutarget, otherwise we seem to be shipping the wrong DLL. This revert is mostly just to buy time to investigate without having to debug why the build logic for the 32-bit windows-gnu target is wrong.This reverts commit e060723, reversing changes made to a9e7b30.
r? infra
cc @ChrisDenton @Kobzol @mati865
try-job: dist-x86_64-msvc
try-job: dist-i686-msvc
try-job: dist-aarch64-msvc
try-job: dist-i686-mingw
try-job: dist-x86_64-mingw
try-job: dist-x86_64-msvc-alt