virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Code Issues Releases Activity

configure: Move the .object_arch check to the right place

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit b77e335e44)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Martin Storsjö 2015-03-05 23:38:00 +02:00 committed by Michael Niedermayer
parent 47e8d17132
commit 5a6ef7d7cb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -4504,11 +4504,6 @@ if enabled_any arm aarch64 || enabled_all ppc altivec && enabled asm; then
check_as <<EOF && enable as_func
.func test
.endfunc
EOF
# llvm's integrated assembler supports .object_arch from llvm 3.5
enabled arm && test "$objformat" = elf && check_as <<EOF && enable as_object_arch
.object_arch armv4
EOF
fi
@ -4566,6 +4561,11 @@ EOF
check_as <<EOF && enable as_dn_directive
ra .dn d0.i16
.unreq ra
EOF
# llvm's integrated assembler supports .object_arch from llvm 3.5
[ "$objformat" = elf ] && check_as <<EOF && enable as_object_arch
.object_arch armv4
EOF
[ $target_os != win32 ] && enabled_all armv6t2 shared !pic && enable_weak_pic