rustup-init.sh: Support detecting 32bit userland on aarch64

We duplicate the 'eabihf' suffix code here to ensure that if we select armv7 as a result, we append the ABI suffix if necessary. This should fix rust-lang#2111 Signed-off-by: Daniel Silverstone <[email protected]>
AJ-Ianozi · Nov 17, 2019 · bb58d24 · bb58d24
1 parent ecb32c6
commit bb58d24
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/rustup-init.sh b/rustup-init.sh
@@ -309,6 +309,14 @@ get_architecture() {
             powerpc64)
                 _cputype=powerpc
                 ;;
+            aarch64)
+                _cputype=armv7
+                if [ "$_ostype" = "linux-android" ]; then
+                    _ostype=linux-androideabi
+                else
+                    _ostype="${_ostype}eabihf"
+                fi
+                ;;
         esac
     fi