mingw: Fix build with patch from Liu Hao #3164
Merged
Conversation
This file contains 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
CohenArthur
force-pushed
the
fix-windows-build
branch
3 times, most recently
from
2358403
to
51fea9c
Compare
This commit adds Liu Hao's patch from https://github.com/lhmouse/MINGW-packages/blob/5859d27b2b6101204a08ad9702cb2937f8797be9/mingw-w64-gcc/0100-rust-fix.patch gcc/rust/ChangeLog: * checks/errors/borrowck/rust-borrow-checker.cc (mkdir_wrapped): Remove. (BorrowChecker::go): Use `mkdir` instead. * expand/rust-proc-macro.cc (register_callback): Use Windows APIs to open dynamic proc macro library. (load_macros_array): Likewise. * parse/rust-parse.cc (defined): Replace separators in paths using std::replace.
|
You may just take the patch and assume it builds. The patch is also available in MSYS2 (https://github.com/msys2/MINGW-packages/blob/e9b8bb22e94a577fd94ac1ded8519778a02499a5/mingw-w64-gcc/2001-fix-building-rust-on-mingw-w64.patch). |
P-E-P
approved these changes
Sep 23, 2024
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.
This commit adds Liu Hao's patch from
https://github.com/lhmouse/MINGW-packages/blob/5859d27b2b6101204a08ad9702cb2937f8797be9/mingw-w64-gcc/0100-rust-fix.patch
gcc/rust/ChangeLog:
This adds the patch from lhmouse/MINGW-packages@16dad6b but reworked for our new changes.
@lhmouse could you check it looks okay and builds on your side?
Sidenote, this might not build on Linux either - I don't have access to my build machine atm so I'm using the CI to test this patch.