Commit 221d8135 authored by James Almer's avatar James Almer

Merge commit '2cf3c0ab'

* commit '2cf3c0ab':
  Revert "configure: Detect AIX ar command instead of hardcoding it in the OS section"
Merged-by: 's avatarJames Almer <jamrial@gmail.com>
parents 5e4923b4 2cf3c0ab
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment