]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '17ee5b0c13bc17465b71bc9ca1cde9f0eed8b3ff'
authorJames Almer <jamrial@gmail.com>
Fri, 30 Mar 2018 00:15:18 +0000 (21:15 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 30 Mar 2018 00:15:18 +0000 (21:15 -0300)
* commit '17ee5b0c13bc17465b71bc9ca1cde9f0eed8b3ff':
  configure: Use indirection for the -o assembler flag also for x86asm

Merged-by: James Almer <jamrial@gmail.com>
1  2 
configure

diff --cc configure
index 0beeb43f071f4389d5bd4eeec25ba3e6b3ca961e,844c3beb07acbb5ab232c96e8ef7418768680e33..12896473964d551d3b49ba707e792ce83ef24798
+++ 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(){