Skip to content

Commit

Permalink
Rollup merge of rust-lang#41356 - richo:darwin-no-cputype-hack, r=ale…
Browse files Browse the repository at this point in the history
…xcrichton

bootstrap: Don't workaround uname -m on Darwin

This no longer manifests on any versions of OSX that I could find.

How far back is Rust officially supported? I can try to get copies to test when this behaviour changed.

(Fun fact, at a minimum the comment already lies, since the flag is `-m` :))
  • Loading branch information
frewsxcv authored Apr 18, 2017
2 parents 5654936 + 1dbc72b commit 69fa948
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions src/bootstrap/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -404,14 +404,6 @@ def build_triple(self):
raise Exception(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,
# at least for the subset of platforms we're willing to target.
if ostype == 'Linux':
Expand Down

0 comments on commit 69fa948

Please sign in to comment.