OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9270a2b
66a1ccd
)
Merge commit '66a1ccd7467ab1913cd8877114c6d4c2588bb12f'
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 16 Oct 2012 11:27:19 +0000
(13:27 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 16 Oct 2012 11:27:19 +0000
(13:27 +0200)
* commit '
66a1ccd7467ab1913cd8877114c6d4c2588bb12f
':
configure: simplify argument handling in check_ld
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1
2
configure
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
configure
index
33bb214
,
e6b2a31
..
18f57ae
---
1
/
configure
---
2
/
configure
+++ b/
configure
@@@
-761,14
-704,9
+761,11
@@@
ld_o()
check_ld(){
log check_ld "$@"
- flags=''
- libs=''
- for f; do
- test "${f}" = "${f#-l}" && flags="$flags $f" || libs="$libs $f"
- done
+ type=$1
+ shift 1
- check_cc $($cflags_filter $flags) || return
+ flags=$(filter_out '-l*' "$@")
+ libs=$(filter '-l*' "$@")
+ check_$type $($cflags_filter $flags) || return
flags=$($ldflags_filter $flags)
libs=$($ldflags_filter $libs)
check_cmd $ld $LDFLAGS $flags $(ld_o $TMPE) $TMPO $libs $extralibs