diff options
| author | Shawn Walker-Salas <shawn.walker@oracle.com> | 2017-02-11 09:24:33 -0800 |
|---|---|---|
| committer | Shawn Walker-Salas <shawn.walker@oracle.com> | 2017-02-11 20:28:44 -0800 |
| commit | ee54be3c9a8099d45d64764f0e50c315d5256a4c (patch) | |
| tree | c9b0519b87d54d4b7550dfa05efb83871bfeb041 /src/bootstrap/bootstrap.py | |
| parent | 912bc14a6b25bac66822766b09dcfb3c6263757d (diff) | |
| download | rust-ee54be3c9a8099d45d64764f0e50c315d5256a4c.tar.gz rust-ee54be3c9a8099d45d64764f0e50c315d5256a4c.zip | |
Add Solaris as recognized ostype
Add cputype recognition for Solaris Fixes #39729
Diffstat (limited to 'src/bootstrap/bootstrap.py')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 27255b69100..9593e3f0793 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -345,6 +345,21 @@ class RustBuild(object): ostype = 'unknown-openbsd' elif ostype == 'NetBSD': ostype = 'unknown-netbsd' + elif ostype == 'SunOS': + ostype = 'sun-solaris' + # On Solaris, uname -m will return a machine classification instead + # of a cpu type, so uname -p is recommended instead. However, the + # output from that option is too generic for our purposes (it will + # always emit 'i386' on x86/amd64 systems). As such, isainfo -k + # must be used instead. + try: + cputype = subprocess.check_output(['isainfo', + '-k']).strip().decode(default_encoding) + except (subprocess.CalledProcessError, WindowsError): + err = "isainfo not found" + if self.verbose: + raise Exception(err) + sys.exit(err) elif ostype == 'Darwin': ostype = 'apple-darwin' elif ostype.startswith('MINGW'): |
