From 2c77ca459e9c9aceee5ed93f8dd8de09e9fbf8df Mon Sep 17 00:00:00 2001 From: Shawn Rainey Date: Thu, 25 Jun 2015 11:01:12 -0400 Subject: [PATCH] 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 --- configure | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 06209362de..c1f1fcafe9 100755 --- a/configure +++ b/configure @@ -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}"