Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-23 09:04:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #161 from thewtex/emscripten-bump

Browse Source 
browser-asmjs: Bump Emscripten to 1.37.21
This commit is contained in:
Matt McCormick 2017-09-14 18:20:40 -04:00 committed by GitHub
commit a7fe377eac
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
browser-asmjs/Dockerfile.in
View File

@ -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" MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
# Revert back to "/bin/sh" as default shell # 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" #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 PATH /emsdk_portable:/emsdk_portable/llvm/clang/bin/:/emsdk_portable/sdk/:${PATH}
ENV CC=/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/emcc \ ENV CC=/emsdk_portable/sdk/emcc \
CXX=/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/em++ \ CXX=/emsdk_portable/sdk/em++ \
AR=/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/emar AR=/emsdk_portable/sdk/emar
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/browser-asmjs 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 # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE