Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve MinGW detection when cross compiling #69549

Merged
merged 2 commits into from
Mar 1, 2020
Merged

Conversation

mati865
Copy link
Contributor

@mati865 mati865 commented Feb 28, 2020

Official mingw-w64 builds, MSYS2 and LLVM MinGW provide both gcc.exe and $ARCH-w64-mingw32-gcc.exe so 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 gcc as native compiler and $ARCH-w64-mingw32-gcc.exe for MinGW. This means users will no longer have to override the linker.

@rust-highfive
Copy link
Collaborator

r? @kennytm

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 28, 2020
src/bootstrap/dist.rs Outdated Show resolved Hide resolved
@kennytm
Copy link
Member

kennytm commented Feb 29, 2020

@bors try

@bors
Copy link
Contributor

bors commented Feb 29, 2020

⌛ Trying commit f0f44aeccb0136fcaf7bd2dfe4132d7ca976b2e9 with merge 26e9f14ccca6fe334704d3d7dc5fdbfa365323b2...

@bors
Copy link
Contributor

bors commented Feb 29, 2020

☀️ Try build successful - checks-azure
Build commit: 26e9f14ccca6fe334704d3d7dc5fdbfa365323b2 (26e9f14ccca6fe334704d3d7dc5fdbfa365323b2)

@mati865
Copy link
Contributor Author

mati865 commented Feb 29, 2020

Tested both i686 and x86_64 builds, they work as good as before on Windows.

@kennytm
Copy link
Member

kennytm commented Feb 29, 2020

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 29, 2020

📌 Commit cdb6955 has been approved by kennytm

@bors bors 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 Feb 29, 2020
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
@bors bors merged commit 559e5ab into rust-lang:master Mar 1, 2020
@mati865 mati865 deleted the mingw branch March 1, 2020 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants