diff options
| author | Diego Biurrun <diego@biurrun.de> | 2017-05-22 12:48:15 +0000 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-06-21 17:00:31 -0300 |
| commit | 5cae5a1defa360da076365a786093a749d1ddf4e (patch) | |
| tree | 2e4049e05d6225a6629cc11f2d9a59de5492fd05 /configure | |
| parent | 4f9297ac3b39098547863d28fbc8d2a906d5be49 (diff) | |
| download | ffmpeg-5cae5a1defa360da076365a786093a749d1ddf4e.tar.gz | |
configure: Move x86 assembler sanity check into assembler probe function
This allows for more graceful fallback from NASM to Yasm if the available
NASM version is too old.
(Cherry-picked from libav commit adfd7892e3b8b40e7a1620f7254459d8e096a9a1)
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -5503,13 +5503,15 @@ EOF x86asm_debug="-g dwarf2" X86ASMDEP='$(DEPX86ASM) $(X86ASMFLAGS) -M $(X86ASM_O) $< > $(@:.o=.d)' fi + check_x86asm "movbe ecx, [5]" && enable x86asm } if ! disabled_any asm mmx x86asm; then + disable x86asm for program in $x86asmexe nasm yasm; do - probe_x86asm $program - test -n "$x86asm_type" && break + probe_x86asm $program && break done + disabled x86asm && die "nasm/yasm not found or too old. Use --disable-x86asm for a crippled build." X86ASMFLAGS="-f $objformat" enabled pic && append X86ASMFLAGS "-DPIC" test -n "$extern_prefix" && append X86ASMFLAGS "-DPREFIX" @@ -5517,8 +5519,6 @@ EOF elf*) enabled debug && append X86ASMFLAGS $x86asm_debug ;; esac - check_x86asm "movbe ecx, [5]" && enable x86asm || - die "nasm/yasm not found or too old. Use --disable-x86asm for a crippled build." check_x86asm "vextracti128 xmm0, ymm0, 0" || disable avx2_external check_x86asm "vpmacsdd xmm0, xmm1, xmm2, xmm3" || disable xop_external check_x86asm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external |