diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-03-10 16:51:23 -0600 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-03-10 16:18:27 -0800 |
| commit | 0ce745bc305bb210f5ddaf60801b47fafb84b986 (patch) | |
| tree | f7e142497128bace1a2a870a551adc508ef7dff8 | |
| parent | 5c715dee38240cc3c4394cb32430f052e9fb0e9a (diff) | |
| parent | 0a55c8e659f0fc540b740101f7a02ab28e300aa4 (diff) | |
Rollup merge of #40261 - infinity0:patch-1, r=alexcrichton
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>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | src/bootstrap/bootstrap.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure index be8628de628..d8861dacafa 100755 --- a/configure +++ b/configure @@ -512,7 +512,7 @@ case $CFG_CPUTYPE in CFG_OSTYPE="${CFG_OSTYPE}eabihf" ;; - armv7l) + armv7l | armv8l) CFG_CPUTYPE=armv7 CFG_OSTYPE="${CFG_OSTYPE}eabihf" ;; 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': |