diff options
| author | Ariel Ben-Yehuda <ariel.byd@gmail.com> | 2017-03-25 15:01:25 +0300 |
|---|---|---|
| committer | Ariel Ben-Yehuda <ariel.byd@gmail.com> | 2017-03-25 17:36:54 +0300 |
| commit | ca85c400dae365c9ade87bbd100ddfe3ecd3822a (patch) | |
| tree | f18bd615bc70545f6e1001e18850605cc2e8af08 /src | |
| parent | 49c67bd632e961a57863805e5d0a400f97da9b93 (diff) | |
| download | rust-ca85c400dae365c9ade87bbd100ddfe3ecd3822a.tar.gz rust-ca85c400dae365c9ade87bbd100ddfe3ecd3822a.zip | |
travis: try to fix the build on emscripten
The emsdk-portable .tar.gz now extracts to emsdk-portable instead of emsdk_portable. Handle that.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/ci/docker/emscripten/build-emscripten.sh | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/ci/docker/emscripten/build-emscripten.sh b/src/ci/docker/emscripten/build-emscripten.sh index 88bf583007c..b9aa197f85e 100755 --- a/src/ci/docker/emscripten/build-emscripten.sh +++ b/src/ci/docker/emscripten/build-emscripten.sh @@ -29,7 +29,20 @@ exit 1 } curl https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz | \ - tar xzf - + tar xzf - + +# Some versions of the EMSDK archive have their contents in .emsdk-portable +# and others in emsdk_portable. Make sure the EMSDK ends up in a fixed path. +if [ -d emsdk-portable ]; then + mv emsdk-portable emsdk_portable +fi + +if [ ! -d emsdk_portable ]; then + echo "ERROR: Invalid emsdk archive. Dumping working directory." >&2 + ls -l + exit 1 +fi + source emsdk_portable/emsdk_env.sh hide_output emsdk update hide_output emsdk install --build=Release sdk-tag-1.37.1-32bit |