diff options
| author | Tim Neumann <mail@timnn.me> | 2017-04-08 08:55:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-08 08:55:10 +0200 |
| commit | c04b39f1f8b645ff938e8ee610f76feeea9132ff (patch) | |
| tree | 1a53c946e9407e71010e7cf0408eb3d12924fbb9 /src | |
| parent | d6c17735cbb0ea7277388d01229c213f3ee31d4f (diff) | |
| parent | 5c0c3e803d6070cc4d1ce0362e0ae3bae4962720 (diff) | |
| download | rust-c04b39f1f8b645ff938e8ee610f76feeea9132ff.tar.gz rust-c04b39f1f8b645ff938e8ee610f76feeea9132ff.zip | |
Rollup merge of #41152 - cuviper:bootstrap-armv7, r=japaric
bootstrap.py: fix armv7 detection This matches the logic that was in `./configure` before f8ca805422db8.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 526beb41aae..2e33b451194 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -472,10 +472,10 @@ class RustBuild(object): cputype = 'i686' elif cputype in {'xscale', 'arm'}: cputype = 'arm' - elif cputype in {'armv6l', 'armv7l', 'armv8l'}: + elif cputype == 'armv6l': cputype = 'arm' ostype += 'eabihf' - elif cputype == 'armv7l': + elif cputype in {'armv7l', 'armv8l'}: cputype = 'armv7' ostype += 'eabihf' elif cputype == 'aarch64': |