From 0e1f94c0245527f1ed231cb68e5098c6e5a119bc Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Sun, 19 Jul 2020 17:27:24 -0400 Subject: [PATCH 1/2] web-wasm: Migrate to Emscripten LLVM upstream backend, 1.39.18 --- web-wasm/Dockerfile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web-wasm/Dockerfile.in b/web-wasm/Dockerfile.in index c2740b7..7865963 100644 --- a/web-wasm/Dockerfile.in +++ b/web-wasm/Dockerfile.in @@ -1,4 +1,4 @@ -FROM trzeci/emscripten-fastcomp:sdk-tag-1.39.10-64bit +FROM trzeci/emscripten-upstream:sdk-tag-1.39.18-64bit MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Revert back to "/bin/sh" as default shell @@ -55,7 +55,7 @@ RUN \ #include "common.docker" -ENV EMSCRIPTEN_VERSION 1.39.10 +ENV EMSCRIPTEN_VERSION 1.39.18 ENV PATH /emsdk_portable:/emsdk_portable/llvm/clang/bin/:/emsdk_portable/emscripten/sdk:${PATH} ENV CC=/emsdk_portable/emscripten/sdk/emcc \ From 58cc27f49e6d482aecac3c2499c399ee7efb44b6 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Mon, 28 Sep 2020 17:58:06 -0400 Subject: [PATCH 2/2] web-wasm: base on emscripten/emsdk:2.0.4 --- web-wasm/Dockerfile.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/web-wasm/Dockerfile.in b/web-wasm/Dockerfile.in index 7865963..48d4841 100644 --- a/web-wasm/Dockerfile.in +++ b/web-wasm/Dockerfile.in @@ -1,4 +1,4 @@ -FROM trzeci/emscripten-upstream:sdk-tag-1.39.18-64bit +FROM emscripten/emsdk:2.0.4 MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Revert back to "/bin/sh" as default shell @@ -55,15 +55,15 @@ RUN \ #include "common.docker" -ENV EMSCRIPTEN_VERSION 1.39.18 +ENV EMSCRIPTEN_VERSION 2.0.4 -ENV PATH /emsdk_portable:/emsdk_portable/llvm/clang/bin/:/emsdk_portable/emscripten/sdk:${PATH} -ENV CC=/emsdk_portable/emscripten/sdk/emcc \ - CXX=/emsdk_portable/emscripten/sdk/em++ \ - AR=/emsdk_portable/emscripten/sdk/emar +ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH} +ENV CC=/emsdk/upstream/emscripten/emcc \ + CXX=/emsdk/upstream/emscripten/em++ \ + AR=/emsdk/upstream/emscripten/emar -ENV CMAKE_TOOLCHAIN_FILE /emsdk_portable/emscripten/sdk/cmake/Modules/Platform/Emscripten.cmake +ENV CMAKE_TOOLCHAIN_FILE /emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake # Build-time metadata as defined at http://label-schema.org ARG BUILD_DATE