-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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
Update Cargo and its dependencies #47280
Conversation
r? @aturon (rust_highfive has picked a reviewer for you, use r? to override) |
Thanks for working on this! Including |
fc25b51
to
8e149f9
Compare
8e149f9
to
ee9fcb5
Compare
|
ee9fcb5
to
e043907
Compare
I think that should be fixed w/ rust-lang/cargo#4926 (and hopefully good to go afterwards) |
e043907
to
edebaa5
Compare
☔ The latest upstream changes (presumably #47248) made this pull request unmergeable. Please resolve the merge conflicts. |
Travis is green, so r=me after fixing the merge conflict (and let the actual debugging begin 😄). |
@bors: r=kennytm |
📌 Commit edebaa5 has been approved by |
edebaa5
to
2580d1a
Compare
☔ The latest upstream changes (presumably #47392) made this pull request unmergeable. Please resolve the merge conflicts. |
2580d1a
to
43c4fe2
Compare
@bors: r=kennytm |
📌 Commit 43c4fe2 has been approved by |
@bors p=1 |
⌛ Testing commit 43c4fe228cbb82b377ed34c71a09c376297b8c21 with merge 31a263c05d17d0cb7da5a1d2ceb7083cf7ef1c63... |
💔 Test failed - status-appveyor |
As expected
|
📌 Commit 57c2f90 has been approved by |
⌛ Testing commit 57c2f90e616c82d6dd4807332bf0efbc096f3226 with merge c0a65e0e9932bd2cb77c74c7be13d56fb0182593... |
💔 Test failed - status-appveyor |
Same error. |
It's building the things using stage0 and that stage doesn't yet have the fix of those two import libraries in the sysroot. |
Ah. Could we build them using stage2? (If stage0 can't be fixed) |
I would prefer that we don't move anything to later stages because stage 0 doesn't work; if this is a bug in stage 0, we can backport and bump the bootstrap compiler or workaround it temporarily, I think. However, if there's no other solution, moving to stage 2 compilation should be relatively painless. |
I've confirmed that the master branch of winapi builds cleanly (no env vars set) with MinGW due to the use of prefixed libraries. Due to other bugs however we can't actually use |
☔ The latest upstream changes (presumably #47522) made this pull request unmergeable. Please resolve the merge conflicts. |
@alexcrichton You will still need to set one of those environment variables though in order to avoid issues with external projects that depend on rustc internal crates failing to link because they can't find winapi's prefixed libraries. I've published new versions now. |
57c2f90
to
970c996
Compare
This'll probably have a bunch of build errors, so let's try and head those off and find them sooner rather than later!
970c996
to
80d6ed2
Compare
@bors: r=kennytm |
📌 Commit 80d6ed2 has been approved by |
Update Cargo and its dependencies This'll probably have a bunch of build errors, so let's try and head those off and find them sooner rather than later!
☀️ Test successful - status-appveyor, status-travis |
This'll probably have a bunch of build errors, so let's try and head those off
and find them sooner rather than later!