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 #389 from thewtex/emscripten-1.39.10

Browse Source 
web-wasm: Bump Emscripten to 1.39.10
This commit is contained in:
Matt McCormick 2020-04-14 11:26:10 -04:00 committed by GitHub
commit 7299cbb52c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
web-wasm/Dockerfile.in
View File

@ -1,4 +1,4 @@
FROM trzeci/emscripten-slim:sdk-tag-1.39.4-64bit FROM trzeci/emscripten-fastcomp:sdk-tag-1.39.10-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
@ -11,10 +11,10 @@ ARG DEBIAN_FRONTEND=noninteractive
ARG REPO=http://cdn-fastly.deb.debian.org ARG REPO=http://cdn-fastly.deb.debian.org
RUN \ RUN \
bash -c "echo \"deb $REPO/debian stretch main contrib non-free\" > /etc/apt/sources.list" && \ bash -c "echo \"deb $REPO/debian buster main contrib non-free\" > /etc/apt/sources.list" && \
bash -c "echo \"deb $REPO/debian stretch-updates main contrib non-free\" >> /etc/apt/sources.list" && \ bash -c "echo \"deb $REPO/debian buster-updates main contrib non-free\" >> /etc/apt/sources.list" && \
bash -c "echo \"deb $REPO/debian-security stretch/updates main\" >> /etc/apt/sources.list" && \ bash -c "echo \"deb $REPO/debian-security buster/updates main\" >> /etc/apt/sources.list" && \
bash -c "echo \"deb http://ftp.debian.org/debian stretch-backports main\" >> /etc/apt/sources.list" && \ bash -c "echo \"deb http://ftp.debian.org/debian buster-backports main\" >> /etc/apt/sources.list" && \
apt-get update --yes && \ apt-get update --yes && \
apt-get install --no-install-recommends --yes \ apt-get install --no-install-recommends --yes \
automake \ automake \
@ -56,15 +56,15 @@ RUN \
#include "common.docker" #include "common.docker"
ENV EMSCRIPTEN_VERSION 1.39.4 ENV EMSCRIPTEN_VERSION 1.39.10
ENV PATH /emsdk_portable:/emsdk_portable/llvm/clang/bin/:/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}:${PATH} ENV PATH /emsdk_portable:/emsdk_portable/llvm/clang/bin/:/emsdk_portable/emscripten/sdk:${PATH}
ENV CC=/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/emcc \ ENV CC=/emsdk_portable/emscripten/sdk/emcc \
CXX=/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/em++ \ CXX=/emsdk_portable/emscripten/sdk/em++ \
AR=/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/emar AR=/emsdk_portable/emscripten/sdk/emar
ENV CMAKE_TOOLCHAIN_FILE /emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/cmake/Modules/Platform/Emscripten.cmake ENV CMAKE_TOOLCHAIN_FILE /emsdk_portable/emscripten/sdk/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