From 16fb2a4e699645764e40a6cc60b621a1f0323795 Mon Sep 17 00:00:00 2001 From: Alex Huszagh Date: Fri, 24 Jun 2022 14:36:21 -0500 Subject: [PATCH] Update emsdk version to 3.1.14. --- README.md | 4 ++-- docker/Dockerfile.asmjs-unknown-emscripten | 2 +- docker/Dockerfile.wasm32-unknown-emscripten | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index dd90ea727..e1d7c95ef 100644 --- a/README.md +++ b/README.md @@ -362,7 +362,7 @@ terminate. | `thumbv7m-none-eabi` [4] | 2.2.0 | 4.9.3 | | N/A | | | `thumbv7neon-linux-androideabi` [1] | 9.0.8 | 9.0.8 | ✓ | 6.1.0 | ✓ | | `thumbv7neon-unknown-linux-gnueabihf`| 2.23 | 5.4.0 | ✓ | 5.1.0 | ✓ | -| `wasm32-unknown-emscripten` [6] | 3.1.10 | 15.0.0 | ✓ | N/A | ✓ | +| `wasm32-unknown-emscripten` [6] | 3.1.14 | 15.0.0 | ✓ | N/A | ✓ | | `x86_64-linux-android` [1] | 9.0.8 | 9.0.8 | ✓ | 6.1.0 | ✓ | | `x86_64-pc-windows-gnu` | N/A | 7.3 | ✓ | N/A | ✓ | | `x86_64-sun-solaris` | 1.22.7 | 8.4.0 | ✓ | N/A | | @@ -372,7 +372,7 @@ terminate. | `x86_64-unknown-linux-gnu:centos` [5] | 2.17 | 4.8.5 | ✓ | 4.2.1 | ✓ | | `x86_64-unknown-linux-musl` | 1.1.24 | 9.2.0 | ✓ | N/A | ✓ | | `x86_64-unknown-netbsd` [3] | 9.2.0 | 9.4.0 | ✓ | N/A | | - + [1] libc = bionic; Only works with native tests, that is, tests that do not depends on the Android Runtime. For i686 some tests may fails with the error `assertion diff --git a/docker/Dockerfile.asmjs-unknown-emscripten b/docker/Dockerfile.asmjs-unknown-emscripten index bb32d6689..31781fcb5 100644 --- a/docker/Dockerfile.asmjs-unknown-emscripten +++ b/docker/Dockerfile.asmjs-unknown-emscripten @@ -1,4 +1,4 @@ -FROM emscripten/emsdk:3.1.10 +FROM emscripten/emsdk:3.1.14 WORKDIR / ARG DEBIAN_FRONTEND=noninteractive diff --git a/docker/Dockerfile.wasm32-unknown-emscripten b/docker/Dockerfile.wasm32-unknown-emscripten index 962f48c14..2d040a7f0 100644 --- a/docker/Dockerfile.wasm32-unknown-emscripten +++ b/docker/Dockerfile.wasm32-unknown-emscripten @@ -1,4 +1,4 @@ -FROM emscripten/emsdk:3.1.10 +FROM emscripten/emsdk:3.1.14 WORKDIR / ARG DEBIAN_FRONTEND=noninteractive @@ -16,5 +16,4 @@ RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ python ENV CARGO_TARGET_WASM32_UNKNOWN_EMSCRIPTEN_RUNNER=node \ - BINDGEN_EXTRA_CLANG_ARGS_wasm32_unknown_emscripten="--sysroot=/emsdk/upstream/emscripten/cache/sysroot" \ - EMCC_CFLAGS="-s ERROR_ON_UNDEFINED_SYMBOLS=0 --no-entry ${EMCC_CFLAGS}" + BINDGEN_EXTRA_CLANG_ARGS_wasm32_unknown_emscripten="--sysroot=/emsdk/upstream/emscripten/cache/sysroot"