Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-01-22 06:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #444 from thewtex/wasm-upstream

Browse Source 
Wasm upstream
This commit is contained in:
Matt McCormick 2020-09-28 23:40:34 -04:00 committed by GitHub
commit 608e6aca8d
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-fastcomp:sdk-tag-1.39.10-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.10
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