X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=package%2Ftoolchain%2FMakefile;h=b9d582ee4dcb6663acca76e64b6e8d790c358bd2;hb=c1710901c5cd47717e972798bbc6108f5be55652;hp=c194a34d034845d9dec6ee42b77312229cf92729;hpb=bb83657bc0dd39eeeea40f54c818570cab7ce574;p=oweals%2Fopenwrt.git

diff --git a/package/toolchain/Makefile b/package/toolchain/Makefile
index c194a34d03..b9d582ee4d 100644
--- a/package/toolchain/Makefile
+++ b/package/toolchain/Makefile
@@ -172,6 +172,7 @@ endef
 
 define Package/libthread-db
 $(call Package/libc/Default)
+  DEPENDS:=@!USE_MUSL
   TITLE:=POSIX thread library debugging support
 endef
 
@@ -230,6 +231,7 @@ endef
 
 define Package/ldd
 $(call Package/libc/Default)
+  DEPENDS:=@!USE_MUSL
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=LDD trace utility
@@ -258,6 +260,7 @@ endef
 
 define Package/ldconfig
 $(call Package/libc/Default)
+  DEPENDS:=@!USE_MUSL
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Shared library path configuration
@@ -426,6 +429,16 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
 		$(1)/lib/
   endef
 
+  define Package/musl/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) \
+		$(TOOLCHAIN_DIR)/lib/ld-musl-*.so* \
+		$(1)/lib/
+	$(CP) \
+		$(TOOLCHAIN_DIR)/lib/libc.so* \
+		$(1)/lib/
+  endef
+
   define Package/libc/install
     $(call Package/$(LIBC)/install,$1)
   endef
@@ -441,6 +454,7 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
 
   define Package/libpthread/install
 	$(INSTALL_DIR) $(1)/lib
+  ifneq ($(CONFIG_USE_MUSL),y)
 	$(CP) \
 		$(TOOLCHAIN_DIR)/lib/libpthread.so.* \
 		$(if $(BUILD_LIBGCC),\
@@ -448,14 +462,18 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
 			$(TOOLCHAIN_DIR)/lib/libpthread-$(LIBC_SO_VERSION).so \
 		) \
 		$(1)/lib/
+  endif
   endef
 
   define Package/libthread-db/install
 	$(INSTALL_DIR) $(1)/lib
 	$(CP) \
-		$(TOOLCHAIN_DIR)/lib/libthread_db.so.* \
+		$(TOOLCHAIN_DIR)/lib/libthread_db.so.* $(1)/lib
+  ifeq ($(USE_UCLIBC),y)
+	$(CP) \
 		$(TOOLCHAIN_DIR)/lib/libthread_db-$(LIBC_SO_VERSION).so \
 		$(1)/lib/
+  endif
   endef
 
   define Package/libpthread/install_lib
@@ -464,10 +482,12 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
 
   define Package/librt/install
 	$(INSTALL_DIR) $(1)/lib
+  ifneq ($(CONFIG_USE_MUSL),y)
 	$(CP) \
 		$(TOOLCHAIN_DIR)/lib/librt.so.* \
 		$(TOOLCHAIN_DIR)/lib/librt-$(LIBC_SO_VERSION).so \
 		$(1)/lib/
+  endif
   endef
 
   define Package/ldd/install