bootstrap: refactor mingw dist and fix gnullvm #144659
Open
Conversation
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
rustbot
added
S-waiting-on-author
|
@bors try jobs=dist-aarch64-windows-gnullvm,dist-x86_64-windows-gnullvm,dist-i686-windows-gnu,dist-x86_64-windows-gnu Also including regular windows-gnu to double-check there is no regression there. |
rust-bors bot
added a commit
that referenced
this pull request
Jul 29, 2025
bootstrap: extract cc query into a new function try-job: dist-aarch64-windows-gnullvm try-job: dist-x86_64-windows-gnullvm try-job: dist-i686-windows-gnu try-job: dist-x86_64-windows-gnu
|
💔 Test failed (CI). Failed job:
|
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
@bors try jobs=dist-aarch64-windows-gnullvm,dist-x86_64-windows-gnullvm,dist-i686-mingw,dist-x86_64-mingw |
rust-bors bot
added a commit
that referenced
this pull request
Jul 30, 2025
bootstrap: extract cc query into a new function try-job: dist-aarch64-windows-gnullvm try-job: dist-x86_64-windows-gnullvm try-job: dist-i686-mingw try-job: dist-x86_64-mingw
|
Tested the changes against parent commit using the following commands on Linux:
I hope this clearly (albeit in a lengthy way) shows no regression for |
mati865
force-pushed
the
gnullvm-vendor-libunwind
branch
from
cc7a7a5 to
e22a6ce
Compare
|
rustbot has assigned @albertlarsan68. Use |
rustbot
added
S-waiting-on-review
|
Beta was branched already last week, right? |
mati865
changed the title
|
Judging by their profile albertlarsan68 seems to be away right now, so I will take a liberty to reroll because the release is near and this might get backported for the next beta. r? rust-lang/bootstrap |
Kobzol
reviewed
Aug 4, 2025
| } | ||
| // FIXME(#144565): Remove this whole `let ...` |
There was a problem hiding this comment.
I don't understand the FIXME, it also refers to some other PR?
| rustc_dlls.push("libgcc_s_dw2-1.dll"); | ||
| } else { | ||
| rustc_dlls.push("libgcc_s_seh-1.dll"); | ||
| } | ||
| } else { |
There was a problem hiding this comment.
I would spell gnullvm explicitly here, to make it more obvious which targets need libunwind.dll.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #144533
The first two commits are NFC and only clean up the code, paving the way for the third commit. That said, I think they are worthwhile even without that fix - reusing the same function for two different outcomes was confusing.
The third commit is the fix for #144533, but due to the cross-compilation dance it requires a workaround to find the DLL since that logic really was meant only for Windows builders. That workaround is short-lived and will be removed as soon as gnullvm bootstraps itself.