Commit 0f14ce16 authored by Yann Flory's avatar Yann Flory

test

parent a7c4fee3
......@@ -76,6 +76,7 @@ RUN apt-get install -y nodejs
RUN echo "## Get EMSDK" \
&& git clone https://github.com/emscripten-core/emsdk.git ${EMSDK} \
&& cd ${EMSDK} && git reset --hard ${EMSDK_CHANGESET} \
&& git fetch --all --tags && git checkout 1.39.4 \
\
&& ./emsdk.py update-tags \
&& echo "## Done"
......@@ -179,7 +180,9 @@ RUN . ${EMSDK}/emsdk_set_env.sh \
# Rebuild boost under wasm
RUN rm -rf /core/Common/3dParty/boost/boost_1_58_0
RUN cd /core/Common/3dParty/boost/ && ./fetch.sh && ./build.sh && /emsdk/upstream/bin/llvm-ranlib /core/Common/3dParty/boost/boost_1_58_0/build/linux_32/static/libboost_regex.a
RUN cd /core/Common/3dParty/boost/ && ./fetch.sh
RUN cd /core/Common/3dParty/boost/ && ./build.sh
RUN /emsdk/upstream/bin/llvm-ranlib /core/Common/3dParty/boost/boost_1_58_0/build/linux_32/static/libboost_regex.a
# Preparing emscripten build
RUN update-alternatives --install /usr/bin/gcc gcc /emsdk/upstream/emscripten/emcc 20 \
......@@ -188,6 +191,7 @@ RUN update-alternatives --install /usr/bin/gcc gcc /emsdk/upstream/emscripten/em
&& update-alternatives --install /usr/bin/clang++ clang++ /emsdk/upstream/bin/clang++ 20 \
&& update-alternatives --install /usr/bin/ar ar /emsdk/upstream/bin/llvm-ar 20 \
&& update-alternatives --install /usr/bin/rc rc /emsdk/upstream/bin/llvm-rc 20
RUN cd /core && make x2t
# Make sure we run the right code
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment