virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '4822ee3ca620a92cd2b0a9a03ea9e34288192c79'

Browse Source 
* commit '4822ee3ca620a92cd2b0a9a03ea9e34288192c79':
  configure: Detect AIX ar command instead of hardcoding it in the OS section

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-30 11:20:06 +02:00
commit 5fae467894
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -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
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"