Patch applied upstream

This commit is contained in:
Ximin Luo 2017-03-11 15:59:28 +01:00
parent ef7272ebf0
commit fd22ba4b71

View File

@ -1,6 +1,6 @@
Description: Support armhf running on a 64-bit kernel
Author: Matthias Klose <doko@debian.org>
Forwarded: https://github.com/rust-lang/rust/pull/40261
Applied-Upstream: commit:0a55c8e659f0fc540b740101f7a02ab28e300aa4
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: b/configure
@ -16,3 +16,16 @@ Index: b/configure
CFG_CPUTYPE=armv7
CFG_OSTYPE="${CFG_OSTYPE}eabihf"
;;
Index: b/src/bootstrap/bootstrap.py
===================================================================
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -372,7 +372,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':