]> git.lizzy.rs Git - rust.git/commit
projects / rust.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 49c67bd 935d84a)
Auto merge of #40821 - arielb1:fix-emscripten, r=TimNN
authorbors <bors@rust-lang.org>
Sat, 25 Mar 2017 22:33:29 +0000 (22:33 +0000)
committerbors <bors@rust-lang.org>
Sat, 25 Mar 2017 22:33:29 +0000 (22:33 +0000)
commit0e4b4eb6ab632a1d0ad32f5260235b39f88b6866
tree62f1f79051466e50d8b7347edefd69603dc5941dtree | snapshot
parent49c67bd632e961a57863805e5d0a400f97da9b93commit | diff
parent935d84a272a8b637e13c54b18a1571994e962e5ccommit | diff
Auto merge of #40821 - arielb1:fix-emscripten, r=TimNN

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
Empowering everyone to build reliable and efficient software.