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.

Sign up for GitHub

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

Jump to bottom

Update to the latest wasi-sysroot. #1342

Merged
merged 1 commit into from May 16, 2019
Merged

Update to the latest wasi-sysroot. #1342

merged 1 commit into from May 16, 2019

Conversation

sunfishcode
Copy link
Member

  • Rename wasm32-unknown-wasi to wasm32-wasi.
  • __wasilibc_rmfileat was renamed to __wasilibc_unlinkat
  • Add bindings for a few more functions and typedefs.

@rust-highfive
Copy link

r? @gnzlbg

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

@sunfishcode
Copy link
Member Author

r? @alexcrichton

@rust-highfive rust-highfive assigned alexcrichton and unassigned gnzlbg May 15, 2019
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented May 15, 2019

📌 Commit acd7ad8 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented May 15, 2019

⌛ Testing commit acd7ad8 with merge bdd47f7...

bors added a commit that referenced this pull request May 15, 2019
@bors
Auto merge of #1342 - sunfishcode:master, r=alexcrichton
bdd47f7 
Update to the latest wasi-sysroot.

 - Rename `wasm32-unknown-wasi` to `wasm32-wasi`.
 - `__wasilibc_rmfileat` was renamed to `__wasilibc_unlinkat`
 - Add bindings for a few more functions and typedefs.
@bors
Copy link
Contributor

bors commented May 15, 2019

💔 Test failed - checks-travis

@gnzlbg
Copy link
Contributor

gnzlbg commented May 16, 2019

This is blocked by #1337 which is blocked on this error:

error: toolchain 'nightly-x86_64-unknown-linux-gnu' does not contain component 'rust-std' for target 'wasm32-unknown-wasi'
The command "rustup target add wasm32-unknown-wasi" failed. Retrying, 2 of 3.

@gnzlbg
Copy link
Contributor

gnzlbg commented May 16, 2019

This PR does not appear to modify the .travis.yml target name, so maybe the wasi target is not being shipped with nightly anymore or will come in the next nightly?

@mati865
Copy link
Contributor

mati865 commented May 16, 2019 •
edited

@gnzlbg this target is broken since 2019-05-11: https://rust-lang.github.io/rustup-components-history/wasm32-unknown-wasi.html

@gnzlbg
Copy link
Contributor

gnzlbg commented May 16, 2019

@mati865 https://rust-lang.github.io/rustup-components-history/wasm32-wasi.html works, so maybe it was renamed?

@mati865
Copy link
Contributor

mati865 commented May 16, 2019

Ah that was rust-lang/rust#60585

So combining Ubuntu update and this PR (with small fix to download new name) should fix the CI.

@gnzlbg gnzlbg mentioned this pull request May 16, 2019
Merged
@gnzlbg
Copy link
Contributor

gnzlbg commented May 16, 2019

This needs to be rebased.

@bors
Copy link
Contributor

bors commented May 16, 2019

☔ The latest upstream changes (presumably #1337) made this pull request unmergeable. Please resolve the merge conflicts.

@sunfishcode
Update to the latest wasi-sysroot.
215cd15 
 - Rename `wasm32-unknown-wasi` to `wasm32-wasi`.
 - `__wasilibc_rmfileat` was renamed to `__wasilibc_unlinkat`
 - Add bindings for a few more functions and typedefs.
@gnzlbg
Copy link
Contributor

gnzlbg commented May 16, 2019

@bors: r+

@bors
Copy link
Contributor

bors commented May 16, 2019

📌 Commit 215cd15 has been approved by gnzlbg

@bors
Copy link
Contributor

bors commented May 16, 2019

⌛ Testing commit 215cd15 with merge 6bc42d4...

bors added a commit that referenced this pull request May 16, 2019
@bors
Auto merge of #1342 - sunfishcode:master, r=gnzlbg
6bc42d4 
Update to the latest wasi-sysroot.

 - Rename `wasm32-unknown-wasi` to `wasm32-wasi`.
 - `__wasilibc_rmfileat` was renamed to `__wasilibc_unlinkat`
 - Add bindings for a few more functions and typedefs.
@bors
Copy link
Contributor

bors commented May 16, 2019

☀️ Test successful - checks-cirrus, checks-travis, status-appveyor
Approved by: gnzlbg
Pushing 6bc42d4 to master...

@bors bors merged commit 215cd15 into rust-lang:master May 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@sunfishcode @rust-highfive @alexcrichton @bors @gnzlbg @mati865