Skip to content

Improve external MinGW detection #69351

New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom
Merged
merged 2 commits into from
Feb 23, 2020
Merged

Improve external MinGW detection #69351

merged 2 commits into from
Feb 23, 2020

Conversation

mati865
Copy link
Member

@mati865 mati865 commented Feb 21, 2020

Fixes #68872

@rust-highfive
Copy link
Contributor

r? @cramertj

(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 21, 2020
@cramertj
Copy link
Member

I wonder if this should perhaps reuse the get_file_path tool added in https://github.com/rust-lang/rust/pull/56397/files? It seems like this is doing something very similar.

@mati865
Copy link
Member Author

mati865 commented Feb 21, 2020 •
edited
Loading

get_file_path is already using code modified in this PR:

rust/src/librustc_codegen_ssa/back/link.rs

Line 1039 in 8aa9d20

if let Some(compiler_libs_path) = get_crt_libs_path(sess) {
😅

It was changed in #67429

@cramertj
Copy link
Member

Ah, my bad, thanks for the link! LGTM then.

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 21, 2020

📌 Commit 4904b9c has been approved by cramertj

@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 21, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Feb 23, 2020
@Dylan-DPC
Rollup merge of rust-lang#69351 - mati865:mingw-ultimate-fix, r=cramertj
cec0003 
Improve external MinGW detection

Fixes rust-lang#68872
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Feb 23, 2020
Merged
@bors
Copy link
Collaborator

bors commented Feb 23, 2020

⌛ Testing commit 4904b9c with merge 87b0d83...

@bors
Copy link
Collaborator

bors commented Feb 23, 2020

☀️ Test successful - checks-azure
Approved by: cramertj
Pushing 87b0d83 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 23, 2020
@bors bors merged commit 87b0d83 into rust-lang:master Feb 23, 2020
@mati865 mati865 deleted the mingw-ultimate-fix branch February 23, 2020 16:17
bors added a commit that referenced this pull request Feb 23, 2020
@bors
Auto merge of #69393 - Dylan-DPC:rollup-rxbd1zg, r=Dylan-DPC
6d0e58b 
Rollup of 5 pull requests

Successful merges:

 - #69336 (Do not ping the infrastructure team on toolstate changes)
 - #69351 (Improve external MinGW detection)
 - #69361 (parse: allow `type Foo: Ord` syntactically)
 - #69375 (Rename CodeMap to SourceMap follow up)
 - #69376 (parser: Cleanup `Parser::bump_with` and its uses)

Failed merges:

r? @ghost
@mati865 mati865 mentioned this pull request Mar 10, 2020
Merged
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@cramertj cramertj

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mati865 @rust-highfive @cramertj @bors