diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-10-20 06:57:19 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-10-20 06:57:19 +0000 |
| commit | 12efcae535e15e0d99ff342166283bee33a00ae7 (patch) | |
| tree | f205e00d6eeb0785df33d85fb89ed4026ffcc66b | |
| parent | a5aafb299c0f31a7f287b34dd8232aaa685cc0ae (diff) | |
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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18089 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/base-files/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index b288c0dfc..4ee95aedf 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 |