bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #41152 - cuviper:bootstrap-armv7, r=japaric

Browse source 
bootstrap.py: fix armv7 detection

This matches the logic that was in `./configure` before f8ca805422.
This commit is contained in:
Tim Neumann 2017-04-08 08:55:10 +02:00 • committed by GitHub
commit c04b39f1f8
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/bootstrap/bootstrap.py
View file

@ -472,10 +472,10 @@ class RustBuild(object):
cputype = 'i686' cputype = 'i686'
elif cputype in {'xscale', 'arm'}: elif cputype in {'xscale', 'arm'}:
cputype = 'arm' cputype = 'arm'
elif cputype in {'armv6l', 'armv7l', 'armv8l'}: elif cputype == 'armv6l':
cputype = 'arm' cputype = 'arm'
ostype += 'eabihf' ostype += 'eabihf'
elif cputype == 'armv7l': elif cputype in {'armv7l', 'armv8l'}:
cputype = 'armv7' cputype = 'armv7'
ostype += 'eabihf' ostype += 'eabihf'
elif cputype == 'aarch64': elif cputype == 'aarch64':