aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-03-10 12:27:46 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-03-10 12:27:46 +0000
commite8491ab2a5eb9b6f5a912a6ad7746384fe3e7126 (patch)
tree2dd223e58bb7cbe20b7f4203e73f6b3bb47e3be6
parentc6abf50358e0a52b79f510cb922fa16361201d00 (diff)
downloadupstream-e8491ab2a5eb9b6f5a912a6ad7746384fe3e7126.tar.gz
upstream-e8491ab2a5eb9b6f5a912a6ad7746384fe3e7126.tar.bz2
upstream-e8491ab2a5eb9b6f5a912a6ad7746384fe3e7126.zip
base-files: make library relinking uclibc specific and fix libpthread installation for the non-relinked variant
SVN-Revision: 26003
-rw-r--r--package/base-files/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index bf8d30d7b7..b7fb07309e 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -328,7 +328,7 @@ 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.*)
ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
- ifneq ($(CONFIG_GCC_VERSION_LINARO),)
+ ifneq ($(if $(CONFIG_USE_UCLIBC),$(CONFIG_GCC_VERSION_LINARO)),)
BUILD_LIBGCC:=$(if $(CONFIG_avr32)$(CONFIG_m68k)$(CONFIG_powerpc),,$(PKG_BUILD_DIR)/libgcc_s.so.*)
endif
endif
@@ -539,7 +539,10 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
$(INSTALL_DIR) $(1)/lib
$(CP) \
$(TOOLCHAIN_DIR)/lib/libpthread.so.* \
- $(PKG_BUILD_DIR)/libpthread-$(LIBC_SO_VERSION).so \
+ $(if $(BUILD_LIBGCC),\
+ $(PKG_BUILD_DIR)/libpthread-$(LIBC_SO_VERSION).so, \
+ $(TOOLCHAIN_DIR)/lib/libpthread-$(LIBC_SO_VERSION).so \
+ ) \
$(1)/lib/
endef