Auto merge of #2225 - JohnTitor:wasi, r=JohnTitor

Update FIXME for WASI

r? `@ghost`

.github/workflows/bors.yml

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

ci/docker/wasm32-wasi/Dockerfile

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