diff options
| author | Shawn Rainey <srainey@delta-info.com> | 2015-06-25 11:01:12 -0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-25 18:46:39 +0200 |
| commit | 2c77ca459e9c9aceee5ed93f8dd8de09e9fbf8df (patch) | |
| tree | d00b6a6cfdb76250809baeef46ab906878246388 /configure | |
| parent | 87961eff23abf710b575488ac62ee7d121a4ea07 (diff) | |
| download | ffmpeg-2c77ca459e9c9aceee5ed93f8dd8de09e9fbf8df.tar.gz | |
configure: Fix ranlib failure with older cross toolchains
Cross-compile toolchains without support for ranlib -D would fail.
This fixes the configure script to test the cross ranlib rather than the native ranlib.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -2810,11 +2810,7 @@ ln_s="ln -s -f" nm_default="nm -g" objformat="elf" pkg_config_default=pkg-config -if ranlib 2>&1 | grep -q "\-D "; then - ranlib_default="ranlib -D" -else - ranlib_default="ranlib" -fi +ranlib_default="ranlib" strip_default="strip" yasmexe_default="yasm" windres_default="windres" @@ -3188,7 +3184,11 @@ cc_default="${cross_prefix}${cc_default}" cxx_default="${cross_prefix}${cxx_default}" nm_default="${cross_prefix}${nm_default}" pkg_config_default="${cross_prefix}${pkg_config_default}" -ranlib_default="${cross_prefix}${ranlib_default}" +if ${cross_prefix}${ranlib_default} 2>&1 | grep -q "\-D "; then + ranlib_default="${cross_prefix}${ranlib_default} -D" +else + ranlib_default="${cross_prefix}${ranlib_default}" +fi strip_default="${cross_prefix}${strip_default}" windres_default="${cross_prefix}${windres_default}" |