diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-30 11:20:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-30 11:20:12 +0200 |
| commit | 5fae4678949b2a24225c152867ebd97c4918dc53 (patch) | |
| tree | 583aed87c2512fe0f0f9397555f7e2e231982371 | |
| parent | dc737f0bfa80c395d265bd4d9e4faf2ba4170bd6 (diff) | |
| parent | 4822ee3ca620a92cd2b0a9a03ea9e34288192c79 (diff) | |
| download | ffmpeg-5fae4678949b2a24225c152867ebd97c4918dc53.tar.gz | |
Merge commit '4822ee3ca620a92cd2b0a9a03ea9e34288192c79'
* commit '4822ee3ca620a92cd2b0a9a03ea9e34288192c79':
configure: Detect AIX ar command instead of hardcoding it in the OS section
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -3031,6 +3031,9 @@ if $ar 2>&1 | grep -q Microsoft; then elif $ar 2>&1 | grep -q 'Texas Instruments'; then arflags="rq" ar_o='$@' +elif $ar 2>&1 | grep -q 'Usage: ar.*-X.*any'; then + arflags='-Xany -r -c' + ar_o='$@' else arflags="rc" ar_o='$@' @@ -3406,7 +3409,6 @@ case $target_os in SHFLAGS=-shared add_cppflags '-I\$(SRC_PATH)/compat/aix' enabled shared && add_ldflags -Wl,-brtl - ar_default='ar -Xany' ;; haiku) prefix_default="/boot/common" |