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 FIXME for WASI #2225

Merged
merged 2 commits into from Jul 16, 2021
Merged

Update FIXME for WASI #2225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91db0a9
Add a symlink to wasm-ld
JohnTitor Jul 16, 2021
1bad28c
Update FIXME
JohnTitor Jul 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/bors.yml
View file
Open in desktop
Expand Up @@ -127,7 +127,10 @@ jobs:
powerpc64le-unknown-linux-gnu,
s390x-unknown-linux-gnu,
riscv64gc-unknown-linux-gnu,
# FIXME: Figure out why this is disabled.
# FIXME: A recent nightly causes a linker failure:
# https://github.com/rust-lang/rust/issues/76679
# See this comment for more details:
# https://github.com/rust-lang/libc/pull/2225#issuecomment-880696737
#wasm32-wasi,
sparc64-unknown-linux-gnu,
wasm32-unknown-emscripten,
Expand Down
3 changes: 2 additions & 1 deletion ci/docker/wasm32-wasi/Dockerfile
View file
Open in desktop
Expand Up @@ -26,7 +26,8 @@ ENV PATH=$PATH:/wasmtime-dev-x86_64-linux
COPY docker/wasm32-wasi/clang.sh /wasi-libc/bin/clang

RUN apt-get install -y --no-install-recommends lld
ENV PATH=$PATH:/usr/lib/llvm-9/bin
RUN ln -s /usr/bin/wasm-ld-10 /usr/bin/wasm-ld
ENV PATH=$PATH:/usr/lib/llvm-10/bin

# Of note here is our clang wrapper which just executes a normal clang
# executable with the right sysroot, and then we're sure to turn off the
Expand Down