diff options
| author | kennytm <kennytm@gmail.com> | 2017-11-01 13:32:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-01 13:32:12 +0800 |
| commit | 28b18790f7dc37c83f67f3974d9e25e176b66bf4 (patch) | |
| tree | aaf9edac2e97cbd9e1df472c320f5b5cb496f60f | |
| parent | 18fa54f835c202c4ee58a12425ba080ddb0a5447 (diff) | |
| parent | d7dec7c8d71b30fea6e4c5aca40adce1724ba87d (diff) | |
Rollup merge of #45624 - glaubitz:bootstrap-sparc64, r=kennytm
bootstrap: Add missing cputype matching for sparc64 Trying to configure rust natively on sparc64-unknown-linux-gnu currently fails with: ``` root@deb4g:/local_scratch/glaubitz/rust/rust# ./configure --host=sparc64-unknown-linux-gnu --enable-local-rust --local-rust-root=/usr/local configure: processing command line configure: configure: build.host := ['sparc64-unknown-linux-gnu'] configure: build.rustc := /usr/local/bin/rustc configure: build.cargo := /usr/local/bin/cargo configure: build.rustc := /usr/local/bin/rustc configure: build.cargo := /usr/local/bin/cargo configure: build.configure-args := ['--host=sparc64-unknown-linux-gnu', '--enable ... unknown cpu type: sparc64 root@deb4g:/local_scratch/glaubitz/rust/rust# ``` This is trivially fixed by defining sparc64 as a valid cputype.
| -rw-r--r-- | src/bootstrap/bootstrap.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 0ab4c79e3b2..707aceebb1e 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -294,7 +294,7 @@ def default_build_triple(): raise ValueError('unknown byteorder: {}'.format(sys.byteorder)) # only the n64 ABI is supported, indicate it ostype += 'abi64' - elif cputype == 'sparcv9': + elif cputype == 'sparcv9' or cputype == 'sparc64': pass else: err = "unknown cpu type: {}".format(cputype) |