mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-12-22 16:24:27 +01:00
web-wasm: base on emscripten/emsdk:2.0.4
This commit is contained in:
parent
0e1f94c024
commit
58cc27f49e
@ -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"
|
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
||||||
|
|
||||||
# Revert back to "/bin/sh" as default shell
|
# Revert back to "/bin/sh" as default shell
|
||||||
@ -55,15 +55,15 @@ RUN \
|
|||||||
|
|
||||||
#include "common.docker"
|
#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 PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH}
|
||||||
ENV CC=/emsdk_portable/emscripten/sdk/emcc \
|
ENV CC=/emsdk/upstream/emscripten/emcc \
|
||||||
CXX=/emsdk_portable/emscripten/sdk/em++ \
|
CXX=/emsdk/upstream/emscripten/em++ \
|
||||||
AR=/emsdk_portable/emscripten/sdk/emar
|
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
|
# Build-time metadata as defined at http://label-schema.org
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
|
Loading…
Reference in New Issue
Block a user