Skip to content

Restore the download of rust-mingw - #48637

Merged
bors merged 2 commits into
rust-lang:masterfrom
segevfiner:restore-rust-mingw-download
Mar 3, 2018
Merged

Restore the download of rust-mingw#48637
bors merged 2 commits into
rust-lang:masterfrom
segevfiner:restore-rust-mingw-download

Conversation

@segevfiner

@segevfinersegevfiner commented Mar 1, 2018

Copy link
Copy Markdown
Contributor

The build might otherwise break due to mixing MinGW object files from rust-std and the local MinGW which might be newer/older than the version used to build rust-std.

Fixes#48272

r? @alexcrichton

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @aturon

(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 Mar 1, 2018
@segevfiner

Copy link
Copy Markdown
ContributorAuthor

r? @alexcrichton

Comment threadsrc/bootstrap/bootstrap.py Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[00:05:29] tidy error: /checkout/src/bootstrap/bootstrap.py:353: trailing whitespace

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops...

The build might otherwise break due to mixing MinGW object files from
rust-std and the local MinGW which might be newer/older than the version
used to build rust-std.
Fixesrust-lang#48272
@segevfiner
segevfinerforce-pushed the restore-rust-mingw-download branch from f6c9c9b to 39d0b05CompareMarch 1, 2018 13:20
@alexcrichton

Copy link
Copy Markdown
Member

Thanks! Could you leave a comment as to why this is happening as well?

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Mar 1, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 5332d9a has been approved by alexcrichton

@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 Mar 1, 2018
Manishearth added a commit to Manishearth/rust that referenced this pull request Mar 2, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Mar 3, 2018
…oad, r=alexcrichton
Restore the download of rust-mingw
The build might otherwise break due to mixing MinGW object files from rust-std and the local MinGW which might be newer/older than the version used to build rust-std.
Fixesrust-lang#48272
r? @alexcrichton
@kennytmkennytm mentioned this pull request Mar 3, 2018
bors added a commit that referenced this pull request Mar 3, 2018
Rollup of 8 pull requests
- Successful merges: #48283, #48466, #48569, #48629, #48637, #48680, #48513, #48664
- Failed merges:
@bors
bors merged commit 5332d9a into rust-lang:masterMar 3, 2018
@segevfiner
segevfiner deleted the restore-rust-mingw-download branch November 4, 2018 18:49
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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.

6 participants

@segevfiner@rust-highfive@alexcrichton@bors@kennytm@aturon