summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau2009-10-20 06:57:19 +0000
committerFelix Fietkau2009-10-20 06:57:19 +0000
commite48a2fdd9ead03a8e7433d1ae87c743e4c288d5a (patch)
treef205e00d6eeb0785df33d85fb89ed4026ffcc66b
parentbd78e381b0465c4ea122d9487ff9fe21fbdd2589 (diff)
downloadarchive-e48a2fdd9ead03a8e7433d1ae87c743e4c288d5a.tar.gz
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
-rw-r--r--package/base-files/Makefile5
1 files changed, 4 insertions, 1 deletions
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