about summary refs log tree commit diff
path: root/src/rustllvm/RustWrapper.cpp
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-12-31 00:50:46 +0000
committerbors <bors@rust-lang.org>2016-12-31 00:50:46 +0000
commitb68d3293e34fd2be7f61881a2e0733bbbce97619 (patch)
treed164b20c494969c690dd5d0a5daa7e58ce65e9cc /src/rustllvm/RustWrapper.cpp
parent6dcf51aae61dcad1dbe7eef3766df2facef73816 (diff)
parent14994ac6b67cdaff1692f836e3495a75f4f7d71b (diff)
downloadrust-b68d3293e34fd2be7f61881a2e0733bbbce97619.tar.gz
rust-b68d3293e34fd2be7f61881a2e0733bbbce97619.zip
Auto merge of #38601 - schulzch:master, r=brson
Partial fix for #38489.

Fixes script name resolution for windows by invoking `emcc.bat` instead of `emcc`, etc.

Remaining issue:
```
Traceback (most recent call last):
  File "C:\Program Files\Emscripten\emscripten\1.35.0\\emcc", line 1309, in <module>
    final = shared.Building.llvm_opt(final, link_opts, DEFAULT_FINAL)
  File "C:\Program Files\Emscripten\emscripten\1.35.0\tools\shared.py", line 1471, in llvm_opt
    assert os.path.exists(target), 'Failed to run llvm optimizations: ' + output
AssertionError: Failed to run llvm optimizations:
```
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions