ffmpeg | branch: release/2.6 | Martin Storsjö <mar...@martin.st> | Thu Mar 5 23:38:00 2015 +0200| [5a6ef7d7cb95c3a28bc936751b109239e5e4e6c1] | committer: Michael Niedermayer
configure: Move the .object_arch check to the right place Signed-off-by: Martin Storsjö <mar...@martin.st> (cherry picked from commit b77e335e441040a40fc6156b8e4a134745d10233) Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a6ef7d7cb95c3a28bc936751b109239e5e4e6c1 --- configure | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 3464d15..d2044fb 100755 --- a/configure +++ b/configure @@ -4505,11 +4505,6 @@ if enabled_any arm aarch64 || enabled_all ppc altivec && enabled asm; then .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 check_inline_asm inline_asm_labels '"1:\n"' @@ -4568,6 +4563,11 @@ 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 elif enabled mips; then _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
