Patchwork toolchain: have check_glibc to search deeper for ld-linux

login
register
mail settings
Submitter Jean-Mickael Guerin
Date Oct. 12, 2012, 8:25 p.m.
Message ID <1350073550-779-1-git-send-email-jean-mickael.guerin@6wind.com>
Download mbox | patch
Permalink /patch/191199/
State Accepted
Commit c8fd94218ee6284061552ca5de2256417a21bcb9
Headers show

Comments

Jean-Mickael Guerin - Oct. 12, 2012, 8:25 p.m.
ld-linux*.so may not be present in lib/ directory, it could be
in lib32 and/or lib64 only. But check_glibc reports
"Incorrect selection of the C library" in this case, which is
not true.
Fixed by extending the search to  SYSROOT/*/*.

Signed-off-by: Jean-Mickael Guerin <jean-mickael.guerin@6wind.com>
---
 toolchain/helpers.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Arnout Vandecappelle - Oct. 13, 2012, 9:35 a.m.
On 12/10/12 22:25, Jean-Mickael Guerin wrote:
> ld-linux*.so may not be present in lib/ directory, it could be
> in lib32 and/or lib64 only. But check_glibc reports
> "Incorrect selection of the C library" in this case, which is
> not true.
> Fixed by extending the search to  SYSROOT/*/*.
>
> Signed-off-by: Jean-Mickael Guerin<jean-mickael.guerin@6wind.com>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

> ---
>   toolchain/helpers.mk | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
> index d5ab91b..497cfff 100644
> --- a/toolchain/helpers.mk
> +++ b/toolchain/helpers.mk
> @@ -196,7 +196,7 @@ check_glibc_feature = \
>   #
>   check_glibc = \
>   	SYSROOT_DIR="$(strip $1)"; \
> -	if test `find $${SYSROOT_DIR}/lib/ -maxdepth 1 -name 'ld-linux*.so.*' -o -name 'ld.so.*' | wc -l` -eq 0 ; then \
> +	if test `find $${SYSROOT_DIR}/ -maxdepth 2 -name 'ld-linux*.so.*' -o -name 'ld.so.*' | wc -l` -eq 0 ; then \

  Maybe it's better to search in /lib*/ ?  Not that it really matters that much.

  Regards,
  Arnout

>   		echo "Incorrect selection of the C library"; \
>   		exit -1; \
>   	fi; \
Peter Korsgaard - Oct. 20, 2012, 7:06 p.m.
>>>>> "Jean-Mickael" == Jean-Mickael Guerin <jean-mickael.guerin@6wind.com> writes:

 Jean-Mickael> ld-linux*.so may not be present in lib/ directory, it could be
 Jean-Mickael> in lib32 and/or lib64 only. But check_glibc reports
 Jean-Mickael> "Incorrect selection of the C library" in this case, which is
 Jean-Mickael> not true.
 Jean-Mickael> Fixed by extending the search to  SYSROOT/*/*.

Committed, thanks.

Patch

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index d5ab91b..497cfff 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -196,7 +196,7 @@  check_glibc_feature = \
 #
 check_glibc = \
 	SYSROOT_DIR="$(strip $1)"; \
-	if test `find $${SYSROOT_DIR}/lib/ -maxdepth 1 -name 'ld-linux*.so.*' -o -name 'ld.so.*' | wc -l` -eq 0 ; then \
+	if test `find $${SYSROOT_DIR}/ -maxdepth 2 -name 'ld-linux*.so.*' -o -name 'ld.so.*' | wc -l` -eq 0 ; then \
 		echo "Incorrect selection of the C library"; \
 		exit -1; \
 	fi; \