Improve MinGW detection when cross compiling #69549
Merged
bors merged 2 commits intorust-lang:masterfrom Mar 1, 2020
Merged
Conversation
Contributor
|
r? @kennytm (rust_highfive has picked a reviewer for you, use r? to override) |
kennytm
reviewed
Feb 29, 2020
Member
|
@bors try |
Collaborator
|
⌛ Trying commit f0f44aeccb0136fcaf7bd2dfe4132d7ca976b2e9 with merge 26e9f14ccca6fe334704d3d7dc5fdbfa365323b2... |
Collaborator
|
☀️ Try build successful - checks-azure |
Co-Authored-By: kennytm <kennytm@gmail.com>
Member
Author
|
Tested both i686 and x86_64 builds, they work as good as before on Windows. |
Member
|
@bors r+ rollup |
Collaborator
|
📌 Commit cdb6955 has been approved by |
bors
added a commit
that referenced
this pull request
Mar 1, 2020
Rollup of 7 pull requests Successful merges: - #69397 (bootstrap: Remove commit hash from LLVM version suffix to avoid rebuilds) - #69549 (Improve MinGW detection when cross compiling ) - #69562 (Don't `bug` when taking discriminant of generator during dataflow) - #69579 (parser: Remove `Parser::prev_span`) - #69580 (use .copied() instead of .map(|x| *x) on iterators) - #69583 (Do not ICE on invalid type node after parse recovery) - #69605 (Use `opt_def_id()` over `def_id()`) Failed merges: r? @ghost
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
4 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.
Official mingw-w64 builds, MSYS2 and LLVM MinGW provide both
gcc.exeand$ARCH-w64-mingw32-gcc.exeso they should not regress but I included CI changes to verify it though@bors try(I don't have permission).This change will come handy when cross compiling from Linux or Cygwin since they use
gccas native compiler and$ARCH-w64-mingw32-gcc.exefor MinGW. This means users will no longer have to override the linker.