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

fix exception handling for isainfo execution failure

Browse Source 
remove unnecessary gcc_s addition in libstd for Solaris
This commit is contained in:
Shawn Walker-Salas 2017-02-11 22:55:25 -08:00
parent 33b655e6a8
commit 4a618fee1e
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bootstrap/bootstrap.py
View File

@ -355,7 +355,7 @@ class RustBuild(object):
try: try:
cputype = subprocess.check_output(['isainfo', cputype = subprocess.check_output(['isainfo',
'-k']).strip().decode(default_encoding) '-k']).strip().decode(default_encoding)
except (subprocess.CalledProcessError, WindowsError): except (subprocess.CalledProcessError, OSError):
err = "isainfo not found" err = "isainfo not found"
if self.verbose: if self.verbose:
raise Exception(err) raise Exception(err)

2
src/libstd/build.rs
View File

@ -46,8 +46,6 @@ fn main() {
} else if target.contains("dragonfly") || target.contains("bitrig") || } else if target.contains("dragonfly") || target.contains("bitrig") ||
target.contains("netbsd") || target.contains("openbsd") { target.contains("netbsd") || target.contains("openbsd") {
println!("cargo:rustc-link-lib=pthread"); println!("cargo:rustc-link-lib=pthread");
} else if target.contains("solaris") {
println!("cargo:rustc-link-lib=gcc_s");
} else if target.contains("apple-darwin") { } else if target.contains("apple-darwin") {
println!("cargo:rustc-link-lib=System"); println!("cargo:rustc-link-lib=System");
} else if target.contains("apple-ios") { } else if target.contains("apple-ios") {