diff options
| -rw-r--r-- | package/glibc/glibc.mk | 8 | ||||
| -rw-r--r-- | toolchain/helpers.mk | 2 | ||||
| -rw-r--r-- | toolchain/toolchain-external/toolchain-external.mk | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 4d89caff02..0dab4926a3 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -112,12 +112,12 @@ endef # GLIBC_LIBS_LIB = \ - ld*.so libc.so libcrypt.so libdl.so libgcc_s.so libm.so \ - libnsl.so libpthread.so libresolv.so librt.so libutil.so \ - libnss_files.so libnss_dns.so + ld*.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* \ + libnsl.so.* libpthread.so.* libresolv.so.* librt.so.* libutil.so.* \ + libnss_files.so.* libnss_dns.so.* ifeq ($(BR2_PACKAGE_GDB_SERVER),y) -GLIBC_LIBS_LIB += libthread_db.so +GLIBC_LIBS_LIB += libthread_db.so.* endif define GLIBC_INSTALL_TARGET_CMDS diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 27b67100fc..37f2cf9b44 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -54,7 +54,7 @@ copy_toolchain_lib_root = \ $${ARCH_SYSROOT_DIR}/$${ARCH_LIB_DIR} \ $${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} \ $${SUPPORT_LIB_DIR} ; do \ - LIBSPATH=`find $${dir} -maxdepth 1 -name "$${LIB}.*" 2>/dev/null` ; \ + LIBSPATH=`find $${dir} -maxdepth 1 -name "$${LIB}" 2>/dev/null` ; \ if test -n "$${LIBSPATH}" ; then \ break ; \ fi \ diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index aaf49945a9..2bfe64a888 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -55,21 +55,21 @@ # of Buildroot is handled identical for the 2 toolchain types. ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) -LIB_EXTERNAL_LIBS+=ld*.so libc.so libcrypt.so libdl.so libgcc_s.so libm.so libnsl.so libresolv.so librt.so libutil.so +LIB_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_HAS_THREADS),y) -LIB_EXTERNAL_LIBS+=libpthread.so +LIB_EXTERNAL_LIBS+=libpthread.so.* ifneq ($(BR2_PACKAGE_GDB_SERVER)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),) -LIB_EXTERNAL_LIBS+=libthread_db.so +LIB_EXTERNAL_LIBS+=libthread_db.so.* endif # gdbserver endif # ! no threads endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC),y) -LIB_EXTERNAL_LIBS+=libnss_files.so libnss_dns.so +LIB_EXTERNAL_LIBS+=libnss_files.so.* libnss_dns.so.* endif ifeq ($(BR2_INSTALL_LIBSTDCPP),y) -USR_LIB_EXTERNAL_LIBS+=libstdc++.so +USR_LIB_EXTERNAL_LIBS+=libstdc++.so.* endif LIB_EXTERNAL_LIBS+=$(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS)) |
