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

bootstrap.py: fix armv7 detection This matches the logic that was in `./configure` before f8ca805422.
2017-04-08 08:55:10 +02:00
parent d6c17735cb 5c0c3e803d
commit c04b39f1f8
1 changed files with 2 additions and 2 deletions
--- 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':