diff options
| author | Richo Healey <richo@psych0tik.net> | 2017-04-17 19:30:18 -0700 |
|---|---|---|
| committer | Richo Healey <richo@psych0tik.net> | 2017-04-17 19:30:18 -0700 |
| commit | 1dbc72b28e4ed4a530801f2689ed8ffb56f4fc21 (patch) | |
| tree | 5201e5c0cc4cb7dae7f0617208ac2dc822523413 /src/bootstrap/bootstrap.py | |
| parent | 235fe8313fd0ffec665f1400da781ab2cb1e13f9 (diff) | |
| download | rust-1dbc72b28e4ed4a530801f2689ed8ffb56f4fc21.tar.gz rust-1dbc72b28e4ed4a530801f2689ed8ffb56f4fc21.zip | |
bootstrap: Don't workaround uname -m on Darwin
This no longer manifests on any versions of OSX that I could find.
Diffstat (limited to 'src/bootstrap/bootstrap.py')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 2e33b451194..3233a73b007 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -404,14 +404,6 @@ class RustBuild(object): 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': |
