decoder: reduce lock scope and cosmetic

[vlc] / contrib / bootstrap

diff --git a/contrib/bootstrap b/contrib/bootstrap
index ec74b94747c58c10a481b03f71bc6952384823df..4d2b826a86fe2c823fccb6febcaf3a5e75a3db7e 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -239,7 +239,13 @@ case "${OS}" in
                        add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
                else
                        check_ios_sdk
-                       add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON" "HAVE_ARMV7A"
+                       add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_FPU"
+
+                       case "${HOST}" in
+                               *arm*)
+                               add_make_enabled "HAVE_NEON" "HAVE_ARMV7A"
+                               ;;
+                       esac;
                fi
                ;;
        *bsd*)
@@ -252,7 +258,7 @@ case "${OS}" in
                        *arm*)
                        add_make "PLATFORM_SHORT_ARCH := arm"
                        ;;
-                       *arm64*)
+                       *arm64*|*aarch64*)
                        add_make "PLATFORM_SHORT_ARCH := arm64"
                        ;;
                        *i686*)