Skip to content

Commit

Permalink
Merge pull request #537 from jpmorganchase/emsdk-1.38.29
Browse files Browse the repository at this point in the history
Upgraded Emscripten to 1.38.29
  • Loading branch information
texodus authored Apr 10, 2019
2 parents 725401d + cde4876 commit 946a450
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
7 changes: 4 additions & 3 deletions cpp/perspective/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -178,14 +178,15 @@ if (PSP_WASM_BUILD)
set(OPT_FLAGS " \
-O3 \
-g0 \
--llvm-lto 3 \
--closure 1 \
-s AGGRESSIVE_VARIABLE_ELIMINATION=1 \
")
endif()

set(SYNC_MODE_FLAGS "-s ENVIRONMENT=node -s BINARYEN_ASYNC_COMPILATION=0 -s BINARYEN_METHOD='\"native-wasm\"' -s WASM=1")
set(ASYNC_MODE_FLAGS "-s ENVIRONMENT=worker -s BINARYEN_ASYNC_COMPILATION=1 -s BINARYEN_METHOD='\"native-wasm\"' -s WASM=1")
set(ASMJS_MODE_FLAGS "-s ENVIRONMENT=worker -s LEGACY_VM_SUPPORT=1 -s BINARYEN_ASYNC_COMPILATION=0 -s BINARYEN_METHOD='\"asmjs\"' -Wno-almost-asm -s WASM=0")
set(SYNC_MODE_FLAGS "-s ENVIRONMENT=node -s BINARYEN_ASYNC_COMPILATION=0 -s WASM=1")
set(ASYNC_MODE_FLAGS "-s ENVIRONMENT=worker -s BINARYEN_ASYNC_COMPILATION=1 -s WASM=1")
set(ASMJS_MODE_FLAGS "-s ENVIRONMENT=worker -s LEGACY_VM_SUPPORT=1 -s BINARYEN_ASYNC_COMPILATION=0 -Wno-almost-asm -s WASM=0")
elseif(PSP_CPP_BUILD OR PSP_PYTHON_BUILD)
#####################
# VANILLA CPP BUILD #
Expand Down
5 changes: 2 additions & 3 deletions docker/emsdk/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Liberally copied from trzeci/emscripten

FROM trzeci/emscripten-slim:sdk-tag-1.38.20-64bit
FROM trzeci/emscripten-slim:sdk-tag-1.38.29-64bit

RUN apt-get -qq -y update
RUN apt-get -qq install -y --no-install-recommends \
Expand All @@ -18,8 +18,7 @@ ant \
libidn11


RUN echo "deb http://http.debian.net/debian jessie-backports main" >> /etc/apt/sources.list
RUN apt-get -qq -y update && apt-get -qq install -y --no-install-recommends -t jessie-backports openjdk-8-jre-headless
RUN apt-get -qq -y update && apt-get -qq install -y --no-install-recommends openjdk-8-jre-headless

RUN wget https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.sh -q
RUN mkdir /opt/cmake
Expand Down

0 comments on commit 946a450

Please sign in to comment.