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

browser-asmjs: Update Emscripten to 1.36.1.

Browse Source 
Only a 32-bit sdk tag is available from emsdk.
This commit is contained in:
Matt McCormick 2016-03-09 18:46:16 -05:00
parent 7225ca1c70
commit f647f8991b
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
browser-asmjs/Dockerfile
View File

@ -8,17 +8,32 @@ RUN curl -sL https://deb.nodesource.com/setup | bash - && \
nodejs \ nodejs \
python2.7 python2.7
ENV EMSCRIPTEN_VERSION 1.35.4 ENV EMSCRIPTEN_VERSION 1.36.1
RUN cd /usr && \ RUN cd /usr && \
curl -L https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz | tar xz && \ curl -L https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz | tar xz && \
cd ./emsdk_portable && \ cd ./emsdk_portable && \
./emsdk update && \ ./emsdk update && \
./emsdk install -j$(nproc) --build=Release sdk-tag-${EMSCRIPTEN_VERSION}-64bit && \ ./emsdk install -j$(nproc) --build=Release sdk-tag-${EMSCRIPTEN_VERSION}-32bit && \
./emsdk activate --build=Release sdk-tag-${EMSCRIPTEN_VERSION}-64bit && \ ./emsdk activate --build=Release sdk-tag-${EMSCRIPTEN_VERSION}-32bit && \
./emsdk install node-4.1.1-64bit && \
./emsdk activate node-4.1.1-64bit && \
./emsdk uninstall node-4.1.1-32bit && \
find . -name "*.o" -exec rm {} \; && \ find . -name "*.o" -exec rm {} \; && \
find . -name "*.a" -exec rm {} \; && \ find . -name "*.a" -exec rm {} \; && \
find . -name "*.tmp" -exec rm {} \; find . -name "*.tmp" -exec rm {} \;
ENV PATH /usr/emsdk_portable:/usr/emsdk_portable/clang/tag-e${EMSCRIPTEN_VERSION}/build_tag-e${EMSCRIPTEN_VERSION}_64/bin:/usr/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}:${PATH} ENV PATH /usr/emsdk_portable:/usr/emsdk_portable/clang/tag-e${EMSCRIPTEN_VERSION}/build_tag-e${EMSCRIPTEN_VERSION}_32/bin:/usr/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}:${PATH}
ENV CC=/usr/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/emcc \
CXX=/usr/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/em++ \
AR=/usr/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/emar
# Emscripten generates system libraries the firsts time it runs
RUN cd /tmp && \
/bin/echo -e "#include <iostream>\nint main() { std::cout << \"first run\"; return 0; }" > /tmp/first_run.cxx && \
$CXX /tmp/first_run.cxx && \
rm /tmp/first_run.* && \
/bin/echo -e "#include <stdio.h>\nint main() { printf(\"first run\"); return 0; }" > /tmp/first_run.c && \
$CC /tmp/first_run.c && \
rm /tmp/first_run.* a.out.js
ENV CMAKE_TOOLCHAIN_FILE /usr/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/cmake/Modules/Platform/Emscripten.cmake ENV CMAKE_TOOLCHAIN_FILE /usr/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/cmake/Modules/Platform/Emscripten.cmake