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

Restore the download of rust-mingw #48637

Merged
merged 2 commits into from
Mar 3, 2018

Conversation

segevfiner
Copy link
Contributor

@segevfiner segevfiner commented Mar 1, 2018

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
Collaborator

r? @aturon

(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 Mar 1, 2018
@segevfiner
Copy link
Contributor Author

r? @alexcrichton

@rust-highfive rust-highfive assigned alexcrichton and unassigned aturon Mar 1, 2018
@@ -350,6 +350,11 @@ def download_stage0(self):
self.fix_executable("{}/bin/rustdoc".format(self.bin_root()))
with open(self.rustc_stamp(), 'w') as rust_stamp:
rust_stamp.write(self.date)

Copy link
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
Contributor Author

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.

Fixes rust-lang#48272
@segevfiner segevfiner force-pushed the restore-rust-mingw-download branch from f6c9c9b to 39d0b05 Compare March 1, 2018 13:20
@alexcrichton
Copy link
Member

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

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 1, 2018

📌 Commit 5332d9a has been approved by alexcrichton

@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 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.

Fixes rust-lang#48272

r? @alexcrichton
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:master Mar 3, 2018
@segevfiner segevfiner deleted the restore-rust-mingw-download branch November 4, 2018 18:49
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.

6 participants