Commit 5fae4678 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '4822ee3c'

* commit '4822ee3c':
  configure: Detect AIX ar command instead of hardcoding it in the OS section
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents dc737f0b 4822ee3c
...@@ -3031,6 +3031,9 @@ if $ar 2>&1 | grep -q Microsoft; then ...@@ -3031,6 +3031,9 @@ if $ar 2>&1 | grep -q Microsoft; then
elif $ar 2>&1 | grep -q 'Texas Instruments'; then elif $ar 2>&1 | grep -q 'Texas Instruments'; then
arflags="rq" arflags="rq"
ar_o='$@' ar_o='$@'
elif $ar 2>&1 | grep -q 'Usage: ar.*-X.*any'; then
arflags='-Xany -r -c'
ar_o='$@'
else else
arflags="rc" arflags="rc"
ar_o='$@' ar_o='$@'
...@@ -3406,7 +3409,6 @@ case $target_os in ...@@ -3406,7 +3409,6 @@ case $target_os in
SHFLAGS=-shared SHFLAGS=-shared
add_cppflags '-I\$(SRC_PATH)/compat/aix' add_cppflags '-I\$(SRC_PATH)/compat/aix'
enabled shared && add_ldflags -Wl,-brtl enabled shared && add_ldflags -Wl,-brtl
ar_default='ar -Xany'
;; ;;
haiku) haiku)
prefix_default="/boot/common" prefix_default="/boot/common"
......
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