about summary refs log tree commit diff
path: root/src/bootstrap/bootstrap.py
diff options
context:
space:
mode:
authorXimin Luo <infinity0@pwned.gg>2017-03-06 21:42:55 +0100
committerAlex Crichton <alex@alexcrichton.com>2017-03-10 08:13:21 -0800
commit0a55c8e659f0fc540b740101f7a02ab28e300aa4 (patch)
tree07baf96f61880fd49a53ffc559380dcf91ecddf0 /src/bootstrap/bootstrap.py
parentf573db4f80c75f156df8a743f456bf087ec81dc2 (diff)
downloadrust-0a55c8e659f0fc540b740101f7a02ab28e300aa4.tar.gz
rust-0a55c8e659f0fc540b740101f7a02ab28e300aa4.zip
Support armhf abi on 64-bit ARM cpus
They report their `uname -m` as armv8l rather than aarch64.

Patch originally by Matthias Klose <doko@debian.org>
Diffstat (limited to 'src/bootstrap/bootstrap.py')
-rw-r--r--src/bootstrap/bootstrap.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index 7dd53f41a21..4f41d337592 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -465,7 +465,7 @@ class RustBuild(object):
             cputype = 'i686'
         elif cputype in {'xscale', 'arm'}:
             cputype = 'arm'
-        elif cputype == 'armv7l':
+        elif cputype in {'armv7l', 'armv8l'}:
             cputype = 'arm'
             ostype += 'eabihf'
         elif cputype == 'aarch64':