From 91db0a901c98b13c93e2ab6bc9b04cd0e79551bf Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Fri, 16 Jul 2021 09:26:11 +0900 Subject: [PATCH 1/2] Add a symlink to wasm-ld --- ci/docker/wasm32-wasi/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/docker/wasm32-wasi/Dockerfile b/ci/docker/wasm32-wasi/Dockerfile index 497d25363526c..ab057ffb3628e 100644 --- a/ci/docker/wasm32-wasi/Dockerfile +++ b/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 From 1bad28c96c0876fb32553cde66acd02932d7c0b9 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Fri, 16 Jul 2021 09:27:43 +0900 Subject: [PATCH 2/2] Update FIXME --- .github/workflows/bors.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bors.yml b/.github/workflows/bors.yml index 62267431c9fcd..f02382c0581d5 100644 --- a/.github/workflows/bors.yml +++ b/.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,