diff options
| author | Simonas Kazlauskas <git@kazlauskas.me> | 2016-09-16 01:48:27 +0300 |
|---|---|---|
| committer | Simonas Kazlauskas <git@kazlauskas.me> | 2016-09-16 01:52:26 +0300 |
| commit | 3f7931017463459768e4281f6f4cea1d75e2e1fe (patch) | |
| tree | 4a4acc65d7a729d22725f50950bdbdbe3d542704 | |
| parent | d1acabeaa204db9235d9e72c5bae4cfaa82da763 (diff) | |
| download | rust-3f7931017463459768e4281f6f4cea1d75e2e1fe.tar.gz rust-3f7931017463459768e4281f6f4cea1d75e2e1fe.zip | |
Try to support py3 with rustbuild better
| -rw-r--r-- | src/bootstrap/bootstrap.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 17a7c9ca66a..14a985e93ce 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -269,6 +269,7 @@ class RustBuild: sys.exit(ret) def build_triple(self): + default_encoding = sys.getdefaultencoding() config = self.get_toml('build') if config: return config @@ -276,8 +277,8 @@ class RustBuild: if config: return config try: - ostype = subprocess.check_output(['uname', '-s']).strip() - cputype = subprocess.check_output(['uname', '-m']).strip() + ostype = subprocess.check_output(['uname', '-s']).strip().decode(default_encoding) + cputype = subprocess.check_output(['uname', '-m']).strip().decode(default_encoding) except (subprocess.CalledProcessError, WindowsError): if sys.platform == 'win32': return 'x86_64-pc-windows-msvc' @@ -289,7 +290,8 @@ class RustBuild: # Darwin's `uname -s` lies and always returns i386. We have to use # sysctl instead. if ostype == 'Darwin' and cputype == 'i686': - sysctl = subprocess.check_output(['sysctl', 'hw.optional.x86_64']) + args = ['sysctl', 'hw.optional.x86_64'] + sysctl = subprocess.check_output(args).decode(default_encoding) if ': 1' in sysctl: cputype = 'x86_64' |