Skip to content

Improve external MinGW detection - #69351

Merged
bors merged 2 commits into
rust-lang:masterfrom
mati865:mingw-ultimate-fix
Feb 23, 2020
Merged

Improve external MinGW detection#69351
bors merged 2 commits into
rust-lang:masterfrom
mati865:mingw-ultimate-fix

Conversation

@mati865

@mati865mati865 commented Feb 21, 2020

Copy link
Copy Markdown
Member

Fixes#68872

@rust-highfive

rust-highfive commented Feb 21, 2020

Copy link
Copy Markdown
Contributor

r? @cramertj

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 21, 2020
@cramertj

cramertj commented Feb 21, 2020

Copy link
Copy Markdown
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

mati865 commented Feb 21, 2020•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

get_file_path is already using code modified in this PR:

rust/src/librustc_codegen_ssa/back/link.rs

Line 1039 in 8aa9d20

ifletSome(compiler_libs_path) = get_crt_libs_path(sess){
😅

It was changed in #67429

@cramertj

cramertj commented Feb 21, 2020

Copy link
Copy Markdown
Member

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

@bors r+

@bors

bors commented Feb 21, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 4904b9c has been approved by cramertj

@borsbors 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 ofrust-lang#69351- mati865:mingw-ultimate-fix, r=cramertj
cec0003
Improve external MinGW detection
Fixesrust-lang#68872
@Dylan-DPC-zzDylan-DPC-zz mentioned this pull request Feb 23, 2020
Merged
@bors

bors commented Feb 23, 2020

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Feb 23, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Feb 23, 2020
@bors
bors merged commit 87b0d83 into rust-lang:masterFeb 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
@mati865mati865 mentioned this pull request Mar 10, 2020
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@cramertjcramertj

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: 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