Skip to content

Commit f1a8847

Browse files
committed
Re-enable CI for asmjs-unknown-emscripten
1 parent 59c4f0c commit f1a8847

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

.github/workflows/bors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
arm-unknown-linux-musleabihf,
112112
# FIXME: Disabled because currently broken, see:
113113
# https://github.com/rust-lang/libc/issues/1591
114-
# asmjs-unknown-emscripten,
114+
asmjs-unknown-emscripten,
115115
i686-linux-android,
116116
i686-unknown-linux-musl,
117117
mips-unknown-linux-gnu,

ci/docker/asmjs-unknown-emscripten/Dockerfile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
FROM ubuntu:20.04
22

3-
RUN apt-get update && \
4-
apt-get install -y --no-install-recommends \
3+
# This is a workaround to avoid the interaction with tzdata.
4+
ENV DEBIAN_FRONTEND=noninteractive
5+
ENV TZ=America/New_York
6+
7+
RUN apt-get update
8+
RUN apt-get install -y --no-install-recommends tzdata
9+
RUN apt-get install -y --no-install-recommends \
510
ca-certificates \
611
curl \
712
gcc \
@@ -18,5 +23,9 @@ RUN bash /emscripten.sh
1823
ENV PATH=$PATH:/rust/bin \
1924
CARGO_TARGET_ASMJS_UNKNOWN_EMSCRIPTEN_RUNNER=node
2025

26+
# `-g4` is used by default which causes a linking error.
27+
# Using `-g3` not to generate a source map.
28+
ENV EMCC_CFLAGS=-g3
29+
2130
COPY emscripten-entry.sh /
2231
ENTRYPOINT ["/emscripten-entry.sh"]

0 commit comments

Comments
 (0)