RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-02 18:48:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '0e83e95c60892747f2f1bd8382f915f2397f99a5'

Browse Source 
* commit '0e83e95c60892747f2f1bd8382f915f2397f99a5':
  configure: Reset X86ASM_DEP(FLAGS) when probing for the assembler program

See f66086adac

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-11-06 18:14:15 -03:00
commit d9e59029a1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -5637,10 +5637,14 @@ EOF
x86asmexe=$x86asmexe_probe x86asmexe=$x86asmexe_probe
x86asm_type=nasm x86asm_type=nasm
x86asm_debug="-g -F dwarf" x86asm_debug="-g -F dwarf"
X86ASMDEP=
X86ASM_DEPFLAGS='-MD $(@:.o=.d)'
elif check_cmd $x86asmexe_probe --version; then elif check_cmd $x86asmexe_probe --version; then
x86asmexe=$x86asmexe_probe x86asmexe=$x86asmexe_probe
x86asm_type=yasm x86asm_type=yasm
x86asm_debug="-g dwarf2" x86asm_debug="-g dwarf2"
X86ASMDEP='$(DEPX86ASM) $(X86ASMFLAGS) -M $(X86ASM_O) $< > $(@:.o=.d)'
X86ASM_DEPFLAGS=
fi fi
check_x86asm "movbe ecx, [5]" && enable x86asm check_x86asm "movbe ecx, [5]" && enable x86asm
} }
@ -5651,8 +5655,6 @@ EOF
probe_x86asm $program && break probe_x86asm $program && break
done done
disabled x86asm && die "nasm/yasm not found or too old. Use --disable-x86asm for a crippled build." 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" X86ASMFLAGS="-f $objformat"
enabled pic && append X86ASMFLAGS "-DPIC" enabled pic && append X86ASMFLAGS "-DPIC"
test -n "$extern_prefix" && append X86ASMFLAGS "-DPREFIX" test -n "$extern_prefix" && append X86ASMFLAGS "-DPREFIX"