Merge commit '2cf3c0ab0d84b5cdb379059f8570809a13a306b9'

* commit '2cf3c0ab0d84b5cdb379059f8570809a13a306b9':
  Revert "configure: Detect AIX ar command instead of hardcoding it in the OS section"

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

1 files changed, 1 insertions, 3 deletions

diff --git a/configure b/configure
index 4cdb3370d7..0e030f0e39 100755
--- a/configure
+++ b/configure
@@ -4374,9 +4374,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='$@'
 elif $ar 2>&1 | grep -q "\[D\] "; then
     arflags="rcD"
     ar_o='$@'
@@ -4876,6 +4873,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