projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a8730f1
)
base-files: make library relinking uclibc specific and fix libpthread installation...
author
Felix Fietkau
<nbd@openwrt.org>
Thu, 10 Mar 2011 12:27:46 +0000
(12:27 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Thu, 10 Mar 2011 12:27:46 +0000
(12:27 +0000)
SVN-Revision: 26003
package/base-files/Makefile
patch
|
blob
|
history
diff --git
a/package/base-files/Makefile
b/package/base-files/Makefile
index bf8d30d7b721ada5d3eb828d8880f1789864e3ae..b7fb07309eb18d7158ae1c4318a6d33c77a861a2 100644
(file)
--- 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),)
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
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.* \
$(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
$(1)/lib/
endef