diff options
| author | Shawn Walker-Salas <shawn.walker@oracle.com> | 2017-02-11 22:55:25 -0800 |
|---|---|---|
| committer | Shawn Walker-Salas <shawn.walker@oracle.com> | 2017-02-11 22:56:23 -0800 |
| commit | 4a618fee1efc279d8fe2386f3c74b7e3f3265aa8 (patch) | |
| tree | 2963298375b01f6aed7537874846398608b5998b | |
| parent | 33b655e6a8db00d099d1ef37c2f39f73b1248190 (diff) | |
| download | rust-4a618fee1efc279d8fe2386f3c74b7e3f3265aa8.tar.gz rust-4a618fee1efc279d8fe2386f3c74b7e3f3265aa8.zip | |
fix exception handling for isainfo execution failure
remove unnecessary gcc_s addition in libstd for Solaris
| -rw-r--r-- | src/bootstrap/bootstrap.py | 2 | ||||
| -rw-r--r-- | src/libstd/build.rs | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 7163a6f359c..a632a82bf7d 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -355,7 +355,7 @@ class RustBuild(object): try: cputype = subprocess.check_output(['isainfo', '-k']).strip().decode(default_encoding) - except (subprocess.CalledProcessError, WindowsError): + except (subprocess.CalledProcessError, OSError): err = "isainfo not found" if self.verbose: raise Exception(err) diff --git a/src/libstd/build.rs b/src/libstd/build.rs index 790cd5b65ba..0fca374f6e6 100644 --- a/src/libstd/build.rs +++ b/src/libstd/build.rs @@ -46,8 +46,6 @@ fn main() { } else if target.contains("dragonfly") || target.contains("bitrig") || target.contains("netbsd") || target.contains("openbsd") { println!("cargo:rustc-link-lib=pthread"); - } else if target.contains("solaris") { - println!("cargo:rustc-link-lib=gcc_s"); } else if target.contains("apple-darwin") { println!("cargo:rustc-link-lib=System"); } else if target.contains("apple-ios") { |