aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2017-06-24 17:51:02 +0200
committerDiego Biurrun <diego@biurrun.de>2017-06-24 21:30:42 +0200
commit0e83e95c60892747f2f1bd8382f915f2397f99a5 (patch)
tree69a32ccc82aff86fdbb6ae8e90d72694798668c0
parent7cb053e4ddf258e2dbf52ccc586548680742d758 (diff)
downloadffmpeg-0e83e95c60892747f2f1bd8382f915f2397f99a5.tar.gz
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.
-rwxr-xr-xconfigure2
1 files changed, 2 insertions, 0 deletions
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
}