bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Change default Solaris x86 target to x86_64-pc-solaris

Browse source
This commit is contained in:
Jakub Kulik 2021-02-16 15:02:04 +01:00
parent d2731d8e93
commit c615bed387
7 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/bootstrap/bootstrap.py
View file

@ -240,13 +240,16 @@ def default_build_triple(verbose):
else:
ostype = 'unknown-linux-gnu'
elif ostype == 'SunOS':
ostype = 'sun-solaris'
ostype = 'pc-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.
cputype = require(['isainfo', '-k']).decode(default_encoding)
# sparc cpus have sun as a target vendor
if 'sparc' in cputype:
ostype = 'sun-solaris'
elif ostype.startswith('MINGW'):
# msys' `uname` does not print gcc configuration, but prints msys
# configuration. so we cannot believe `uname -m`: