diff options
| -rw-r--r-- | .github/workflows/bors.yml | 4 | ||||
| -rw-r--r-- | ci/docker/asmjs-unknown-emscripten/Dockerfile | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/.github/workflows/bors.yml b/.github/workflows/bors.yml index 2c16f94cda..bbeb86bd75 100644 --- a/.github/workflows/bors.yml +++ b/.github/workflows/bors.yml @@ -109,9 +109,7 @@ jobs: arm-linux-androideabi, arm-unknown-linux-gnueabihf, arm-unknown-linux-musleabihf, - # FIXME: Disabled because currently broken, see: - # https://github.com/rust-lang/libc/issues/1591 - # asmjs-unknown-emscripten, + asmjs-unknown-emscripten, i686-linux-android, i686-unknown-linux-musl, mips-unknown-linux-gnu, diff --git a/ci/docker/asmjs-unknown-emscripten/Dockerfile b/ci/docker/asmjs-unknown-emscripten/Dockerfile index 57419a368b..bf41bfa9a3 100644 --- a/ci/docker/asmjs-unknown-emscripten/Dockerfile +++ b/ci/docker/asmjs-unknown-emscripten/Dockerfile @@ -1,7 +1,12 @@ FROM ubuntu:20.04 -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ +# This is a workaround to avoid the interaction with tzdata. +ENV DEBIAN_FRONTEND=noninteractive +ENV TZ=America/New_York + +RUN apt-get update +RUN apt-get install -y --no-install-recommends tzdata +RUN apt-get install -y --no-install-recommends \ ca-certificates \ curl \ gcc \ @@ -18,5 +23,9 @@ RUN bash /emscripten.sh ENV PATH=$PATH:/rust/bin \ CARGO_TARGET_ASMJS_UNKNOWN_EMSCRIPTEN_RUNNER=node +# `-g4` is used by default which causes a linking error. +# Using `-g3` not to generate a source map. +ENV EMCC_CFLAGS=-g3 + COPY emscripten-entry.sh / ENTRYPOINT ["/emscripten-entry.sh"] |