Skip to content

Commit 3c907ed

Browse files
committed
Auto merge of #2063 - JohnTitor:asmjs-ci, r=JohnTitor
Re-enable CI for `asmjs-unknown-emscripten` #1591 was closed by #1697 but it was only for `wasm32-unknown-emscripten` actually. We should make a new issue and link to it instead if it's still broken. r? `@ghost`
2 parents 734bb32 + 29feed1 commit 3c907ed

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

.github/workflows/bors.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,7 @@ jobs:
109109
arm-linux-androideabi,
110110
arm-unknown-linux-gnueabihf,
111111
arm-unknown-linux-musleabihf,
112-
# FIXME: Disabled because currently broken, see:
113-
# https://github.com/rust-lang/libc/issues/1591
114-
# asmjs-unknown-emscripten,
112+
asmjs-unknown-emscripten,
115113
i686-linux-android,
116114
i686-unknown-linux-musl,
117115
mips-unknown-linux-gnu,

ci/docker/asmjs-unknown-emscripten/Dockerfile

+11-2
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)