Fix sanity file location within Dockerfile (#568)
Starting from 1.39.20 the .emscripten_sanity file has been moved to upstream/emscripten/cache/sanity.txt.
This commit is contained in:
committed by
GitHub
parent
56f5a2bcc5
commit
b5077e4642
@@ -1,6 +1,6 @@
|
|||||||
FROM debian:buster AS stage_build
|
FROM debian:buster AS stage_build
|
||||||
|
|
||||||
ARG EMSCRIPTEN_VERSION=1.39.18
|
ARG EMSCRIPTEN_VERSION=1.39.20
|
||||||
ENV EMSDK /emsdk
|
ENV EMSDK /emsdk
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
@@ -33,6 +33,7 @@ RUN cd ${EMSDK} \
|
|||||||
&& echo "## Generate standard configuration" \
|
&& echo "## Generate standard configuration" \
|
||||||
&& ./emsdk activate ${EMSCRIPTEN_VERSION} \
|
&& ./emsdk activate ${EMSCRIPTEN_VERSION} \
|
||||||
&& chmod -R 777 ${EMSDK}/upstream/emscripten/cache \
|
&& chmod -R 777 ${EMSDK}/upstream/emscripten/cache \
|
||||||
|
&& cat ${EMSDK}/upstream/emscripten/cache/sanity.txt \
|
||||||
&& echo "## Done"
|
&& echo "## Done"
|
||||||
|
|
||||||
# Clean up emscripten installation and strip some symbols
|
# Clean up emscripten installation and strip some symbols
|
||||||
@@ -50,16 +51,6 @@ RUN echo "## Aggresive optimization: Remove debug symbols" \
|
|||||||
&& find ${EMSDK}/upstream/bin -type f -exec strip -s {} + || true \
|
&& find ${EMSDK}/upstream/bin -type f -exec strip -s {} + || true \
|
||||||
&& echo "## Done"
|
&& echo "## Done"
|
||||||
|
|
||||||
# Generate sanity
|
|
||||||
# TODO(sbc): We should be able to use just emcc -v here but it doesn't
|
|
||||||
# currently create the sanity file.
|
|
||||||
RUN echo "## Generate sanity" \
|
|
||||||
&& cd ${EMSDK} && . ./emsdk_env.sh \
|
|
||||||
&& echo "int main() { return 0; }" > hello.c \
|
|
||||||
&& emcc -c hello.c \
|
|
||||||
&& cat ${EMSDK}/.emscripten_sanity \
|
|
||||||
&& echo "## Done"
|
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
# -------------------------------- STAGE DEPLOY --------------------------------
|
# -------------------------------- STAGE DEPLOY --------------------------------
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
|
|||||||
Reference in New Issue
Block a user