fix exception handling for isainfo execution failure

remove unnecessary gcc_s addition in libstd for Solaris

Author: binarycrusader

src/bootstrap/bootstrap.py

@@ -355,7 +355,7 @@ def build_triple(self):
             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)

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") {