Merged
Conversation
Contributor
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Member
|
@bors r+ p=1 |
Collaborator
|
📌 Commit cd02052 has been approved by |
Collaborator
|
🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened |
bors
added
S-waiting-on-bors
Member
|
@bors p=1000 |
Collaborator
|
⌛ Testing commit cd02052 with merge 0f6aa648428adfe886c188c9a9e54ed2ec7caa3e... |
Collaborator
|
💥 Test timed out |
bors
added
S-waiting-on-review
Contributor
Author
|
@bors retry |
bors
added
S-waiting-on-bors
Collaborator
|
closing tree as a precaution @bors treeclosed=1000 |
|
what did i miss lol @bors treeclosed=1000 |
Collaborator
|
☀️ Test successful - checks-azure |
Contributor
Author
|
@bors treeclosed- |
Mark-Simulacrum
added
beta-accepted
Member
|
Accepting for beta backport as well as it's "just necessary" |
Mark-Simulacrum
removed
the
beta-nominated
Merged
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 15, 2020
…-morse,Mark-Simulacrum [beta] backport This is a beta backport rollup of the following: * [beta] Revert heterogeneous SocketAddr PartialEq impls rust-lang#73318 * Fix emcc failure for wasm32. rust-lang#73213 * Revert rust-lang#71956 rust-lang#73153 * [beta] Update cargo rust-lang#73141 * Minor: off-by-one error in RELEASES.md rust-lang#72914 * normalize adt fields during structural match checking rust-lang#72897 * Revert pr 71840 rust-lang#72989 * rust-lang/cargo#8361 * e658200 from rust-lang#72901 r? @ghost
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The wasm32 job is currently failing on CI with the error
ERROR: llc executable not found at /usr/bin/llc. The issue is that emscripten-core/emsdk#472 has changed how emsdk discovers its configuration. We were relying on the global behavior that would use a configuration from the home directory. However, it looks like emsdk is moving away from that approach. This change adds the necessary env var for emcc to find the correct configuration.There are a few alternate approaches this could take. The
--no-embeddedoption could be passed toemsdk activateto use the old behavior, but it seems like they want to move away from that. Another option is to sourceemsdk_env.sh, which is how these env vars normally get set. I'm not entirely sure how to do that easily in a Dockerfile, though.