Skip to content

Commit

Permalink
configure: Fix ranlib failure with older cross toolchains
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
rainey authored and michaelni committed Jun 25, 2015
1 parent 87961ef commit 2c77ca4
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions configure
Expand Up @@ -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"
Expand Down Expand Up @@ -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}"

Expand Down

0 comments on commit 2c77ca4

Please sign in to comment.