From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 20 Oct 2009 06:57:19 +0000 (+0000)
Subject: install the right version of libgcc along with its version map to fix relinking issue... 
X-Git-Tag: reboot~22140
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=dc637ccdffa831bdfbeae9fece6b3545711f3149;p=openwrt%2Fstaging%2Flynxis.git

install the right version of libgcc along with its version map to fix relinking issues with mklibs, attempt to relink only if the version map is actually present

SVN-Revision: 18089
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index b288c0dfce..4ee95aedfe 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -419,7 +419,10 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
   define Package/libc/install_lib
 	$(CP) $(filter-out %/libdl_pic.a,$(wildcard $(TOOLCHAIN_DIR)/usr/lib/lib*.a)) $(1)/lib/
 	$(if $(wildcard $(TOOLCHAIN_DIR)/usr/lib/libc_so.a),$(CP) $(TOOLCHAIN_DIR)/usr/lib/libc_so.a $(1)/lib/libc_pic.a)
-	$(CP) $(TOOLCHAIN_DIR)/usr/lib/gcc/*/*/libgcc.a $(1)/lib/libgcc_s_pic.a
+	$(if $(wildcard $(TOOLCHAIN_DIR)/usr/lib/gcc/*/*/libgcc.map), \
+		$(CP) $(TOOLCHAIN_DIR)/usr/lib/gcc/*/*/libgcc_pic.a $(1)/lib/libgcc_s_pic.a; \
+		$(CP) $(TOOLCHAIN_DIR)/usr/lib/gcc/*/*/libgcc.map $(1)/lib/libgcc_s_pic.map \
+	)
   endef
 
   define Package/libpthread/install