]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '2cf3c0ab0d84b5cdb379059f8570809a13a306b9'
authorJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 03:43:08 +0000 (00:43 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 03:43:08 +0000 (00:43 -0300)
* commit '2cf3c0ab0d84b5cdb379059f8570809a13a306b9':
  Revert "configure: Detect AIX ar command instead of hardcoding it in the OS section"

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

diff --cc configure
index 4cdb3370d717ae40e4388949b6f324ecce601402,6f96a06f03c73c791bc56c7de69d0ad15f5b0078..0e030f0e39c3084ea05091881d366e2b813179ce
+++ b/configure
  if $ar 2>&1 | grep -q Microsoft; then
      arflags="-nologo"
      ar_o='-out:$@'
- elif $ar 2>&1 | grep -q 'Usage: ar.*-X.*any'; then
-     arflags='-Xany -r -c'
-     ar_o='$@'
 +elif $ar 2>&1 | grep -q "\[D\] "; then
 +    arflags="rcD"
 +    ar_o='$@'
  else
      arflags="rc"
      ar_o='$@'