From: Rust Maintainers <pkg-rust-maintainers@lists.alioth.debian.org>
Date: Mon, 17 Jul 2017 11:41:59 +0000 (+0100)
Subject: u-fix-weird-arm-logic
X-Git-Tag: archive/raspbian/1.17.0+dfsg2-8+rpi1~1^2~16
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2002f4ce5a859692ab7fbbd1efaa25acfa001d6d;p=rustc.git

u-fix-weird-arm-logic


Gbp-Pq: Name u-fix-weird-arm-logic.diff
---

diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index 0a6a251337..01f4661cef 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -469,10 +469,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':