about summary refs log tree commit diff
path: root/src/bootstrap/bootstrap.py
diff options
context:
space:
mode:
authorJosh Stone <jistone@redhat.com>2017-04-07 17:16:52 -0700
committerJosh Stone <jistone@redhat.com>2017-04-07 17:16:52 -0700
commit5c0c3e803d6070cc4d1ce0362e0ae3bae4962720 (patch)
tree63fa0c3624fdbff94dfe93634115ec06fd1eb05a /src/bootstrap/bootstrap.py
parent2564711e803f62e04bebf10408cc1c11297c0caf (diff)
downloadrust-5c0c3e803d6070cc4d1ce0362e0ae3bae4962720.tar.gz
rust-5c0c3e803d6070cc4d1ce0362e0ae3bae4962720.zip
bootstrap.py: fix armv7 detection
This matches the logic that was in `./configure` before f8ca805422db8.
Diffstat (limited to 'src/bootstrap/bootstrap.py')
-rw-r--r--src/bootstrap/bootstrap.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index d5bc6127a1e..4b0491f8bd0 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -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':