Update emscripten.

cross-rs · Dec 30, 2019 · 826d9e4 · 826d9e4
1 parent 10c34a6
commit 826d9e4
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 4 deletions.
diff --git a/docker/Dockerfile.asmjs-unknown-emscripten b/docker/Dockerfile.asmjs-unknown-emscripten
@@ -6,7 +6,19 @@ RUN /common.sh
 COPY cmake.sh /
 RUN /cmake.sh
 
-RUN apt-get install -y --no-install-recommends python
+RUN apt-get update && apt-get install -y --no-install-recommends \
+  g++ \
+  make \
+  file \
+  curl \
+  ca-certificates \
+  python \
+  git \
+  cmake \
+  sudo \
+  gdb \
+  xz-utils \
+  bzip2
 
 COPY emscripten.sh /
 RUN /emscripten.sh
@@ -15,3 +27,6 @@ COPY emscripten-entry.sh /
 ENTRYPOINT ["/emscripten-entry.sh"]
 
 ENV CARGO_TARGET_ASMJS_UNKNOWN_EMSCRIPTEN_RUNNER=node
+
+# Prevent 'wasm2js does not support source maps yet' error.
+ENV RUSTFLAGS='-C debuginfo=0'
diff --git a/docker/Dockerfile.wasm32-unknown-emscripten b/docker/Dockerfile.wasm32-unknown-emscripten
@@ -6,7 +6,19 @@ RUN /common.sh
 COPY cmake.sh /
 RUN /cmake.sh
 
-RUN apt-get install -y --no-install-recommends python
+RUN apt-get update && apt-get install -y --no-install-recommends \
+  g++ \
+  make \
+  file \
+  curl \
+  ca-certificates \
+  python \
+  git \
+  cmake \
+  sudo \
+  gdb \
+  xz-utils \
+  bzip2
 
 COPY emscripten.sh /
 RUN /emscripten.sh

diff --git a/docker/emscripten.sh b/docker/emscripten.sh
@@ -27,8 +27,8 @@ main() {
 
     export HOME=/emsdk-portable/
 
-    ./emsdk install sdk-1.38.15-64bit
-    ./emsdk activate sdk-1.38.15-64bit
+    ./emsdk install 1.38.46-upstream
+    ./emsdk activate 1.38.46-upstream
 
     # Compile and cache libc
     source ./emsdk_env.sh