bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Bootstrap: fallback detection of Windows

Browse source
This commit is contained in:
Andrew Paverd 2020-06-25 15:45:24 +01:00
parent 3c90ae8404
commit 8b368dbcbb
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/bootstrap/bootstrap.py
View file

@ -184,6 +184,7 @@ def default_build_triple():
ostype = require(["uname", "-s"], exit=required) ostype = require(["uname", "-s"], exit=required)
cputype = require(['uname', '-m'], exit=required) cputype = require(['uname', '-m'], exit=required)
# If we do not have `uname`, assume Windows.
if ostype is None or cputype is None: if ostype is None or cputype is None:
return 'x86_64-pc-windows-msvc' return 'x86_64-pc-windows-msvc'
@ -236,6 +237,11 @@ def default_build_triple():
if ostype.endswith('WOW64'): if ostype.endswith('WOW64'):
cputype = 'x86_64' cputype = 'x86_64'
ostype = 'pc-windows-gnu' ostype = 'pc-windows-gnu'
elif sys.platform == 'win32':
# Some Windows platforms might have a `uname` command that returns a
# non-standard string (e.g. gnuwin32 tools returns `windows32`). In
# these cases, fall back to using sys.platform.
return 'x86_64-pc-windows-msvc'
else: else:
err = "unknown OS type: {}".format(ostype) err = "unknown OS type: {}".format(ostype)
sys.exit(err) sys.exit(err)