summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-17 22:19:47 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-17 22:20:53 +0200
commit6be71e9955954422227f9691b4f5367a7169b099 (patch)
treeb33c9eb2869353b11179ebae91ae65943f66b2a6 /configure
parentd6676a16057576e1a0ee66ae89963ec54f632919 (diff)
parenta578b0407dc983aecd72028e1127062689b67089 (diff)
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>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 0a6666cbfa..84e78afadf 100755
--- a/configure
+++ b/configure
@@ -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