]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #40821 - arielb1:fix-emscripten, r=TimNN
authorCorey Farwell <coreyf@rwell.org>
Sat, 25 Mar 2017 16:30:34 +0000 (09:30 -0700)
committerGitHub <noreply@github.com>
Sat, 25 Mar 2017 16:30:34 +0000 (09:30 -0700)
try to fix the build on emscripten

The "upstream" emscripten tar.gz now extracts to `emsdk-portable` instead of `emsdk_portable`, breaking our CI. It might be better to vendor a specific version of emscripten instead of using the latest, but I could not find a good way of doing that.

r? @alexcrichton


Trivial merge