diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-03-10 12:27:46 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-03-10 12:27:46 +0000 |
| commit | 4a02a19628b1f7f960f54cbd4c85fa28cd953563 (patch) | |
| tree | 5c35169085c781b5e7aaaf6e5b9dbb09483e609c /package/base-files | |
| parent | 13ad2c95cf3211b1b9a0097af42b30bf231b4ec9 (diff) | |
| download | upstream-4a02a19628b1f7f960f54cbd4c85fa28cd953563.tar.gz upstream-4a02a19628b1f7f960f54cbd4c85fa28cd953563.tar.bz2 upstream-4a02a19628b1f7f960f54cbd4c85fa28cd953563.zip | |
base-files: make library relinking uclibc specific and fix libpthread installation for the non-relinked variant
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26003 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files')
| -rw-r--r-- | package/base-files/Makefile | 7 |
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 |