Add Solaris as recognized ostype

Add cputype recognition for Solaris

Fixes #39729
This commit is contained in:
Shawn Walker-Salas
2017-02-11 09:24:33 -08:00
parent 912bc14a6b
commit ee54be3c9a
3 changed files with 19 additions and 0 deletions

View File

@@ -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'):