From 3bf8116280f96cf1440cc5c47870257078daf3de Mon Sep 17 00:00:00 2001
From: Thomas Lively <tlively@google.com>
Date: Fri, 7 Jul 2017 16:20:24 -0700
Subject: Split old and experimental wasm builders

---
 src/ci/docker/scripts/emscripten-wasm.sh | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

(limited to 'src/ci/docker/scripts')

diff --git a/src/ci/docker/scripts/emscripten-wasm.sh b/src/ci/docker/scripts/emscripten-wasm.sh
index e693f975f69..0e7da45907f 100644
--- a/src/ci/docker/scripts/emscripten-wasm.sh
+++ b/src/ci/docker/scripts/emscripten-wasm.sh
@@ -27,11 +27,6 @@ exit 1
   set -x
 }
 
-# Download emsdk
-cd /
-curl -L https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz | \
-    tar -xz
-
 # Download last known good emscripten from WebAssembly waterfall
 BUILD=$(curl -L https://storage.googleapis.com/wasm-llvm/builds/linux/lkgr.json | \
     jq '.build | tonumber')
@@ -43,22 +38,10 @@ cd /
 curl -L https://nodejs.org/dist/v8.0.0/node-v8.0.0-linux-x64.tar.xz | \
     tar -xJ
 
-cd /emsdk-portable
-./emsdk update
-hide_output ./emsdk install sdk-1.37.13-64bit
-./emsdk activate sdk-1.37.13-64bit
-
 # Make emscripten use wasm-ready node and LLVM tools
-echo "NODE_JS='/node-v8.0.0-linux-x64/bin/node'" >> /root/.emscripten
+echo "EMSCRIPTEN_ROOT = '/wasm-install/emscripten'" >> /root/.emscripten
+echo "NODE_JS='/usr/local/bin/node'" >> /root/.emscripten
 echo "LLVM_ROOT='/wasm-install/bin'" >> /root/.emscripten
-
-# Make emsdk usable by any user
-cp /root/.emscripten /emsdk-portable
-chmod a+rxw -R /emsdk-portable
-
-# Compile and cache libc
-source ./emsdk_env.sh
-echo "main(){}" > a.c
-HOME=/emsdk-portable/ emcc a.c
-HOME=/emsdk-portable/ emcc -s WASM=1 a.c
-rm -f a.*
+echo "BINARYEN_ROOT = '/wasm-install'" >> /root/.emscripten
+echo "COMPILER_ENGINE = NODE_JS" >> /root/.emscripten
+echo "JS_ENGINES = [NODE_JS]" >> /root/.emscripten
-- 
cgit 1.4.1-3-g733a5