[FFmpeg-cvslog] configure: Reset X86ASM_DEP(FLAGS) when probing for the assembler program

Diego Biurrun git at videolan.org
Mon Nov 6 23:18:03 EET 2017


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Sat Jun 24 17:51:02 2017 +0200| [0e83e95c60892747f2f1bd8382f915f2397f99a5] | committer: Diego Biurrun

configure: Reset X86ASM_DEP(FLAGS) when probing for the assembler program

These variables might be set from a previous probe run, but one or the
other program that is probed for may not grok the flags, resulting in
errors during assembling when the values of those variables are passed
to the assembler.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e83e95c60892747f2f1bd8382f915f2397f99a5
---

 configure | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configure b/configure
index ce0f6c919e..ab183745a7 100755
--- a/configure
+++ b/configure
@@ -4515,12 +4515,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
     }



More information about the ffmpeg-cvslog mailing list