Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-11-10 05:07:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #351 from thewtex/bump-emscripten

Browse Source 
web-wasm: Bump emscripten to sdk-tag-1.38.48
This commit is contained in:
Matt McCormick 2019-11-18 14:11:25 -05:00 committed by GitHub
commit aba2588f88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web-wasm/Dockerfile.in
View File

@ -1,4 +1,4 @@
FROM trzeci/emscripten-slim:sdk-tag-1.38.24-64bit FROM trzeci/emscripten-slim:sdk-tag-1.38.48-64bit
MAINTAINER Matt McCormick "matt.mccormick@kitware.com" MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
# Revert back to "/bin/sh" as default shell # Revert back to "/bin/sh" as default shell
@ -56,15 +56,15 @@ RUN \
#include "common.docker" #include "common.docker"
ENV EMSCRIPTEN_VERSION 1.38.24 ENV EMSCRIPTEN_VERSION 1.38.48
ENV PATH /emsdk_portable:/emsdk_portable/llvm/clang/bin/:/emsdk_portable/sdk/:${PATH} ENV PATH /emsdk_portable:/emsdk_portable/llvm/clang/bin/:/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}:${PATH}
ENV CC=/emsdk_portable/sdk/emcc \ ENV CC=/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/emcc \
CXX=/emsdk_portable/sdk/em++ \ CXX=/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/em++ \
AR=/emsdk_portable/sdk/emar AR=/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/emar
ENV CMAKE_TOOLCHAIN_FILE /emsdk_portable/sdk/cmake/Modules/Platform/Emscripten.cmake ENV CMAKE_TOOLCHAIN_FILE /emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/cmake/Modules/Platform/Emscripten.cmake
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE