ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Sun Nov 12 00:43:08 2017 -0300| [221d813599e4f6a276b4f862e072a0b967d70dd7] | committer: James Almer
Merge commit '2cf3c0ab0d84b5cdb379059f8570809a13a306b9' * commit '2cf3c0ab0d84b5cdb379059f8570809a13a306b9': Revert "configure: Detect AIX ar command instead of hardcoding it in the OS section" Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=221d813599e4f6a276b4f862e072a0b967d70dd7 --- configure | 4 +--- 1 file changed, 1 insertion(+), 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 ====================================================================== diff --cc configure index 4cdb3370d7,6f96a06f03..0e030f0e39 --- a/configure +++ b/configure @@@ -4374,12 -3434,6 +4374,9 @@@ f 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='$@' else arflags="rc" ar_o='$@' _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
