From 7451c09bcfed7dd4dba3aba212ab37a895280ff9 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Thu, 14 Sep 2017 11:44:44 -0400 Subject: [PATCH] browser-asmjs: Bump Emscripten to 1.37.21 --- browser-asmjs/Dockerfile.in | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/browser-asmjs/Dockerfile.in b/browser-asmjs/Dockerfile.in index 09141fb..8132088 100644 --- a/browser-asmjs/Dockerfile.in +++ b/browser-asmjs/Dockerfile.in @@ -1,4 +1,4 @@ -FROM trzeci/emscripten:sdk-tag-1.37.3-64bit +FROM trzeci/emscripten:sdk-tag-1.37.21-64bit MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Revert back to "/bin/sh" as default shell @@ -9,16 +9,19 @@ RUN rm /bin/sh && ln -s /bin/dash /bin/sh #include "common.docker" -ENV EMSCRIPTEN_VERSION 1.37.3 +ENV EMSCRIPTEN_VERSION 1.37.21 -ENV PATH /emsdk_portable:/emsdk_portable/clang/tag-e${EMSCRIPTEN_VERSION}/build_tag-e${EMSCRIPTEN_VERSION}_64/bin:/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}:${PATH} -ENV CC=/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/emcc \ - CXX=/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/em++ \ - AR=/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/emar +ENV PATH /emsdk_portable:/emsdk_portable/llvm/clang/bin/:/emsdk_portable/sdk/:${PATH} +ENV CC=/emsdk_portable/sdk/emcc \ + CXX=/emsdk_portable/sdk/em++ \ + AR=/emsdk_portable/sdk/emar ENV DEFAULT_DOCKCROSS_IMAGE dockcross/browser-asmjs -ENV CMAKE_TOOLCHAIN_FILE /emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/cmake/Modules/Platform/Emscripten.cmake +ENV CMAKE_TOOLCHAIN_FILE /emsdk_portable/sdk/cmake/Modules/Platform/Emscripten.cmake + +RUN chmod 777 /emsdk_portable/.cache* + # Build-time metadata as defined at http://label-schema.org ARG BUILD_DATE