From b5077e4642dece76c4abfd781bd1e6790ae889df Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Thu, 23 Jul 2020 21:49:48 +0200 Subject: [PATCH] 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. --- docker/Dockerfile | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index a01ddbc..5421c7f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ FROM debian:buster AS stage_build -ARG EMSCRIPTEN_VERSION=1.39.18 +ARG EMSCRIPTEN_VERSION=1.39.20 ENV EMSDK /emsdk # ------------------------------------------------------------------------------ @@ -33,6 +33,7 @@ RUN cd ${EMSDK} \ && echo "## Generate standard configuration" \ && ./emsdk activate ${EMSCRIPTEN_VERSION} \ && chmod -R 777 ${EMSDK}/upstream/emscripten/cache \ + && cat ${EMSDK}/upstream/emscripten/cache/sanity.txt \ && echo "## Done" # 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 \ && 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 -------------------------------- # ------------------------------------------------------------------------------