virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '2cf3c0ab0d84b5cdb379059f8570809a13a306b9'

Browse Source 
* commit '2cf3c0ab0d84b5cdb379059f8570809a13a306b9':
  Revert "configure: Detect AIX ar command instead of hardcoding it in the OS section"

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2017-11-12 00:43:08 -03:00
parent 5e4923b411 2cf3c0ab0d
commit 221d813599
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@@ -4374,9 +4374,6 @@ fi
if $ar 2>&1 | grep -q Microsoft; then if $ar 2>&1 | grep -q Microsoft; then
arflags="-nologo" arflags="-nologo"
ar_o='-out:$@' 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 elif $ar 2>&1 | grep -q "\[D\] "; then
arflags="rcD" arflags="rcD"
ar_o='$@' ar_o='$@'
@@ -4876,6 +4873,7 @@ 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'
;; ;;
android) android)
disable symver disable symver