OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #12732 : klutzy/rust/this-is-windows, r=alexcrichton

Browse Source 
On Windows, `LLVMRustGetLastError()` may return non-utf8 mojibake string
if system uses non-English locale. It caused ICE when llvm fails.
This patch doesn't fix the real problem, but just make rustc not die.
This commit is contained in:
bors 2014-03-06 12:37:01 -08:00
commit 987de29865
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustc/back/link.rs
View File

@ -26,7 +26,7 @@ use util::common::time;
use util::ppaux;
use util::sha2::{Digest, Sha256};
use std::c_str::ToCStr;
use std::c_str::{ToCStr, CString};
use std::char;
use std::os::consts::{macos, freebsd, linux, android, win32};
use std::ptr;
@ -61,7 +61,9 @@ pub fn llvm_err(sess: Session, msg: ~str) -> ! {
if cstr == ptr::null() {
sess.fatal(msg);
} else {
sess.fatal(msg + ": " + str::raw::from_c_str(cstr));
let err = CString::new(cstr, false);
let err = str::from_utf8_lossy(err.as_bytes());
sess.fatal(msg + ": " + err.as_slice());
}
}
}