bootstrap: Don't workaround uname -m on Darwin
This no longer manifests on any versions of OSX that I could find.
This commit is contained in:
parent
235fe8313f
commit
1dbc72b28e
@ -404,14 +404,6 @@ class RustBuild(object):
|
|||||||
raise Exception(err)
|
raise Exception(err)
|
||||||
sys.exit(err)
|
sys.exit(err)
|
||||||
|
|
||||||
# Darwin's `uname -s` lies and always returns i386. We have to use
|
|
||||||
# sysctl instead.
|
|
||||||
if ostype == 'Darwin' and cputype == 'i686':
|
|
||||||
args = ['sysctl', 'hw.optional.x86_64']
|
|
||||||
sysctl = subprocess.check_output(args).decode(default_encoding)
|
|
||||||
if ': 1' in sysctl:
|
|
||||||
cputype = 'x86_64'
|
|
||||||
|
|
||||||
# The goal here is to come up with the same triple as LLVM would,
|
# The goal here is to come up with the same triple as LLVM would,
|
||||||
# at least for the subset of platforms we're willing to target.
|
# at least for the subset of platforms we're willing to target.
|
||||||
if ostype == 'Linux':
|
if ostype == 'Linux':
|
||||||
|
Loading…
x
Reference in New Issue
Block a user