ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Mon Nov 6 18:14:15 2017 -0300| [d9e59029a1569c1dd8dafd160682fc4ea5f5bc33] | committer: James Almer
Merge commit '0e83e95c60892747f2f1bd8382f915f2397f99a5' * commit '0e83e95c60892747f2f1bd8382f915f2397f99a5': configure: Reset X86ASM_DEP(FLAGS) when probing for the assembler program See f66086adac5eb9b964c89ea0480487f48875f690 Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d9e59029a1569c1dd8dafd160682fc4ea5f5bc33 --- configure | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 83e5555bca..83b4cc9364 100755 --- a/configure +++ b/configure @@ -5637,10 +5637,14 @@ EOF x86asmexe=$x86asmexe_probe x86asm_type=nasm x86asm_debug="-g -F dwarf" + X86ASMDEP= + X86ASM_DEPFLAGS='-MD $(@:.o=.d)' elif check_cmd $x86asmexe_probe --version; then x86asmexe=$x86asmexe_probe x86asm_type=yasm x86asm_debug="-g dwarf2" + X86ASMDEP='$(DEPX86ASM) $(X86ASMFLAGS) -M $(X86ASM_O) $< > $(@:.o=.d)' + X86ASM_DEPFLAGS= fi check_x86asm "movbe ecx, [5]" && enable x86asm } @@ -5651,8 +5655,6 @@ EOF probe_x86asm $program && break done disabled x86asm && die "nasm/yasm not found or too old. Use --disable-x86asm for a crippled build." - test $x86asm_type = 'nasm' && X86ASM_DEPFLAGS='-MD $(@:.o=.d)' - test $x86asm_type = 'yasm' && X86ASMDEP='$(DEPX86ASM) $(X86ASMFLAGS) -M $(X86ASM_O) $< > $(@:.o=.d)' X86ASMFLAGS="-f $objformat" enabled pic && append X86ASMFLAGS "-DPIC" test -n "$extern_prefix" && append X86ASMFLAGS "-DPREFIX" ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog