]> git.lizzy.rs Git - rust.git/commitdiff
bootstrap.py: fix armv7 detection
authorJosh Stone <jistone@redhat.com>
Sat, 8 Apr 2017 00:16:52 +0000 (17:16 -0700)
committerJosh Stone <jistone@redhat.com>
Sat, 8 Apr 2017 00:16:52 +0000 (17:16 -0700)
This matches the logic that was in `./configure` before f8ca805422db8.

src/bootstrap/bootstrap.py

index d5bc6127a1e7fe31d9db5b50a7c0f597b0d17456..4b0491f8bd0991aade56d83521f4f49022c42520 100644 (file)
@@ -463,10 +463,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':