fix(dist/arm): don't assume armv7 if /proc/cpuinfo is unavailable

rust-lang · May 1, 2024 · 3043a95 · 3043a95
1 parent a36226b
commit 3043a95
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/rustup-init.sh b/rustup-init.sh
@@ -540,8 +540,9 @@ get_architecture() {
     # and fall back to arm.
     # See https://github.com/rust-lang/rustup.rs/issues/587.
     if [ "$_ostype" = "unknown-linux-gnueabihf" ] && [ "$_cputype" = armv7 ]; then
-        if ensure grep '^Features' /proc/cpuinfo | grep -E -q -v 'neon|simd'; then
-            # At least one processor does not have NEON (which is asimd on armv8+).
+        if ! (ensure grep '^Features' /proc/cpuinfo | grep -E -q 'neon|simd') ; then
+            # Either `/proc/cpuinfo` is malformed or unavailable, or
+            # at least one processor does not have NEON (which is asimd on armv8+).
             _cputype=arm
         fi
     fi