[FFmpeg-cvslog] Merge commit '17ee5b0c13bc17465b71bc9ca1cde9f0eed8b3ff'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Mar 29 21:15:18 2018 -0300| [91bcf0b8cdb3cb8046496d470ade25d1c802ca3d] | committer: James Almer

Merge commit '17ee5b0c13bc17465b71bc9ca1cde9f0eed8b3ff'

* commit '17ee5b0c13bc17465b71bc9ca1cde9f0eed8b3ff':
  configure: Use indirection for the -o assembler flag also for x86asm

Merged-by: James Almer <jamrial at gmail.com>

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

 configure | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 0beeb43f07..1289647396 100755
--- a/configure
+++ b/configure
@@ -1027,12 +1027,16 @@ check_insn(){
     check_as ${1}_external "$2"
 }
 
+x86asm_o(){
+    eval printf '%s\\n' $X86ASM_O
+}
+
 test_x86asm(){
     log test_x86asm "$@"
     echo "$1" > $TMPASM
     log_file $TMPASM
     shift 1
-    test_cmd $x86asmexe $X86ASMFLAGS -Werror "$@" -o $TMPO $TMPASM
+    test_cmd $x86asmexe $X86ASMFLAGS -Werror "$@" $(x86asm_o $TMPO) $TMPASM
 }
 
 ld_o(){


======================================================================

diff --cc configure
index 0beeb43f07,844c3beb07..1289647396
--- a/configure
+++ b/configure
@@@ -1032,7 -853,7 +1036,7 @@@ test_x86asm()
      echo "$1" > $TMPASM
      log_file $TMPASM
      shift 1
-     test_cmd $x86asmexe $X86ASMFLAGS -Werror "$@" -o $TMPO $TMPASM
 -    test_cmd $x86asmexe $X86ASMFLAGS "$@" $(x86asm_o $TMPO) $TMPASM
++    test_cmd $x86asmexe $X86ASMFLAGS -Werror "$@" $(x86asm_o $TMPO) $TMPASM
  }
  
  ld_o(){