Commit 7192668c authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

ext-toolchains: take into account other Glibc dynamic loader variants 



External toolchains using Glibc have different names for the dynamic
loader. Some of them name it ld-linux.so.*, while some others (such as
the PowerPC and MIPS CodeSourcery toolchains) name it simply ld.so.*.

Therefore, we fix the glibc detection code to handle this case.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: default avatarYann E. MORIN <yann.morin.1998@anciens.enib.fr>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 861dde63

toolchain/external-toolchain/ext-tool.mk

+4 −6
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ check_glibc_feature = \ 
#

check_glibc = \

	SYSROOT_DIR="$(strip $1)"; \

	if ! test -f $${SYSROOT_DIR}/lib/ld-linux.so.* ; then \

	if ! test -f $${SYSROOT_DIR}/lib/ld-linux.so.* -o -f $${SYSROOT_DIR}/lib/ld.so.* ; then \

		echo "Incorrect selection of the C library"; \

		exit -1; \

	fi; \
@@ -251,11 +251,9 @@ check_cross_compiler_exists = \ 


uclibc: dependencies $(STAMP_DIR)/ext-toolchain-installed



EXTERNAL_LIBS=libc.so libcrypt.so libdl.so libgcc_s.so libm.so libnsl.so libresolv.so librt.so libutil.so

ifeq ($(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)

EXTERNAL_LIBS+=ld-uClibc.so

else

EXTERNAL_LIBS+=ld-linux.so libnss_files.so libnss_dns.so

EXTERNAL_LIBS=ld*.so libc.so libcrypt.so libdl.so libgcc_s.so libm.so libnsl.so libresolv.so librt.so libutil.so

ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GCLIBC),y)

EXTERNAL_LIBS+=libnss_files.so libnss_dns.so

endif



ifeq ($(BR2_INSTALL_LIBSTDCPP),y)