diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-07-05 18:58:54 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-06 07:53:22 +0200 |
| commit | 7192668cbf7c28976938bec2fe78fe7d265fd45a (patch) | |
| tree | b341774cd0e74b32b44b7d71a348b752312dedaa | |
| parent | 861dde63b23295300bed9bd55d33cfcb6f3943eb (diff) | |
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Yann E. MORIN <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | toolchain/external-toolchain/ext-tool.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/toolchain/external-toolchain/ext-tool.mk b/toolchain/external-toolchain/ext-tool.mk index 8daae15ae..3943ceb98 100644 --- a/toolchain/external-toolchain/ext-tool.mk +++ b/toolchain/external-toolchain/ext-tool.mk @@ -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) |