[FFmpeg-cvslog] Revert "configure: Detect AIX ar command instead of hardcoding it in the OS section"

Diego Biurrun git at videolan.org
Sun Nov 12 05:44:06 EET 2017


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Fri Oct  6 21:38:43 2017 +0200| [2cf3c0ab0d84b5cdb379059f8570809a13a306b9] | committer: Diego Biurrun

Revert "configure: Detect AIX ar command instead of hardcoding it in the OS section"

This reverts commit 4822ee3ca620a92cd2b0a9a03ea9e34288192c79.
AIX is a fringe oddity. Do not clutter the main codepath with AIX workarounds.

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

 configure | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/configure b/configure
index 6445976175..6f96a06f03 100755
--- a/configure
+++ b/configure
@@ -3434,9 +3434,6 @@ fi
 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='$@'
 else
     arflags="rc"
     ar_o='$@'
@@ -3815,6 +3812,7 @@ case $target_os in
         SHFLAGS=-shared
         add_cppflags '-I\$(SRC_PATH)/compat/aix'
         enabled shared && add_ldflags -Wl,-brtl
+        ar_default='ar -Xany'
         ;;
     android)
         disable symver



More information about the ffmpeg-cvslog mailing list