mirror of https://git.ffmpeg.org/ffmpeg.git
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>
This commit is contained in:
parent
87961eff23
commit
2c77ca459e
|
@ -2810,11 +2810,7 @@ ln_s="ln -s -f"
|
||||||
nm_default="nm -g"
|
nm_default="nm -g"
|
||||||
objformat="elf"
|
objformat="elf"
|
||||||
pkg_config_default=pkg-config
|
pkg_config_default=pkg-config
|
||||||
if ranlib 2>&1 | grep -q "\-D "; then
|
ranlib_default="ranlib"
|
||||||
ranlib_default="ranlib -D"
|
|
||||||
else
|
|
||||||
ranlib_default="ranlib"
|
|
||||||
fi
|
|
||||||
strip_default="strip"
|
strip_default="strip"
|
||||||
yasmexe_default="yasm"
|
yasmexe_default="yasm"
|
||||||
windres_default="windres"
|
windres_default="windres"
|
||||||
|
@ -3188,7 +3184,11 @@ cc_default="${cross_prefix}${cc_default}"
|
||||||
cxx_default="${cross_prefix}${cxx_default}"
|
cxx_default="${cross_prefix}${cxx_default}"
|
||||||
nm_default="${cross_prefix}${nm_default}"
|
nm_default="${cross_prefix}${nm_default}"
|
||||||
pkg_config_default="${cross_prefix}${pkg_config_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}"
|
strip_default="${cross_prefix}${strip_default}"
|
||||||
windres_default="${cross_prefix}${windres_default}"
|
windres_default="${cross_prefix}${windres_default}"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue