Merge commit 'a578b0407dc983aecd72028e1127062689b67089'

* commit 'a578b0407dc983aecd72028e1127062689b67089': configure: Assume runtime cpu detection on arm on --target-os=android as well Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 6be71e9955
parent d6676a1605 a578b0407d
commit 6be71e9955
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -4393,7 +4393,7 @@ EOF
    enabled vfp     && check_insn vfp     'fadds s0, s0, s0'
    enabled vfpv3   && check_insn vfpv3   'vmov.f32 s0, #1.0'

-    [ $target_os = linux ] ||
+    [ $target_os = linux ] || [ $target_os = android ] ||
        map 'enabled_any ${v}_external ${v}_inline || disable $v' \
            $ARCH_EXT_LIST_ARM