toolchain: only take last found libgcc* file

[openwrt.git] / package / libs / toolchain / Makefile

diff --git a/package/libs/toolchain/Makefile b/package/libs/toolchain/Makefile
index a29b322..e4a78ed 100644 (file)
--- a/package/libs/toolchain/Makefile
+++ b/package/libs/toolchain/Makefile
@@ -289,9 +289,9 @@ define Build/Prepare
        mkdir -p $(PKG_BUILD_DIR)
 endef
 
-LIBGCC_A=$(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc_pic.a)
-LIBGCC_MAP=$(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc.map)
-LIBGCC_SO=$(wildcard $(TOOLCHAIN_DIR)/lib/libgcc_s.so.*)
+LIBGCC_A=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc_pic.a))
+LIBGCC_MAP=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc.map))
+LIBGCC_SO=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/libgcc_s.so.*))
 ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
   ifneq ($(if $(CONFIG_USE_UCLIBC),$(CONFIG_GCC_VERSION_LINARO)),)
     BUILD_LIBGCC:=$(if $(CONFIG_avr32)$(CONFIG_m68k)$(CONFIG_powerpc),,$(PKG_BUILD_DIR)/libgcc_s.so.*)
@@ -429,7 +429,6 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
   endef
 
   LD_MUSL_NAME = $(notdir $(firstword $(wildcard $(TOOLCHAIN_DIR)/lib/ld-musl-*.so*)))
-  $(warning LD_MUSL_NAME='$(LD_MUSL_NAME)')
 
   define Package/musl/install
        $(INSTALL_DIR) $(1)/lib