From 27965ac9467a42fd73bd121b2292c7cb30b1526a Mon Sep 17 00:00:00 2001
From: Michael Droettboom <mdboom@gmail.com>
Date: Thu, 19 Apr 2018 17:05:34 -0400
Subject: [PATCH] Fix issues with toolchain

---
 .travis.yml             | 4 ++--
 emsdk/clean_for_dist.sh | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7e08ab25c..87f8a3458 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,11 +13,11 @@ python:
   - '3.6'
 
 before_install:
-  - wget https://github.com/mozilla/geckodriver/releases/download/v0.20.0/geckodriver-v0.20.0-linux64.tar.gz
+  - wget --quiet https://github.com/mozilla/geckodriver/releases/download/v0.20.0/geckodriver-v0.20.0-linux64.tar.gz
   - mkdir geckodriver
   - tar -xf geckodriver-v0.20.0-linux64.tar.gz -C geckodriver
   - export PATH=$PATH:$PWD/geckodriver
-  - if [ ! -f emsdk/emsdk/emsdk ]; then cd $TRAVIS_BUILD_DIR/emsdk; wget https://github.com/iodide-project/pyodide-demo/raw/toolchain/pyodide_toolchain.tgz; tar -xf pyodide_toolchain.tgz; cd $TRAVIS_BUILD_DIR; fi
+  - if [ ! -f emsdk/emsdk/emsdk ]; then cd $TRAVIS_BUILD_DIR/emsdk; wget --quiet https://github.com/iodide-project/pyodide-demo/raw/toolchain/pyodide_toolchain.tgz; tar -xf pyodide_toolchain.tgz; cd $TRAVIS_BUILD_DIR; fi
 
 install:
   - pip install pytest-xdist selenium
diff --git a/emsdk/clean_for_dist.sh b/emsdk/clean_for_dist.sh
index 32c21d1c2..b414775a7 100755
--- a/emsdk/clean_for_dist.sh
+++ b/emsdk/clean_for_dist.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 find . -name "*.o" -type f -delete
 find . -name "*.a" -type f -delete
 find -type d -name .git -prune -exec rm -rf {} \;
@@ -7,3 +8,7 @@ rm -rf emsdk/emscripten/incoming/tests
 rm -rf emsdk/clang/fastcomp/src
 rm -rf emsdk/zips
 rm -rf emsdk/binaryen/master/test
+rm -rf emsdk/.emscripten_cache
+rm emsdk/.emscripten_cache.lock
+rm emsdk/.emscripten_sanity
+rm emsdk/.emscripten