Browse Source

fix build when static linking is on

Waldemar Brodkorb 9 years ago
parent
commit
11d1e33a78
3 changed files with 6 additions and 0 deletions
  1. 2 0
      package/libgcc/Makefile
  2. 2 0
      package/libpthread/Makefile
  3. 2 0
      package/librt/Makefile

+ 2 - 0
package/libgcc/Makefile

@@ -35,6 +35,7 @@ INSTALL_STYLE:=		manual
 libgcc-install:
 	$(INSTALL_DIR) ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
 ifeq ($(ADK_TARGET_UCLINUX),)
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS),)
 ifeq ($(ADK_LINUX_SH),y)
 ifeq ($(ADK_TARGET_LIB_GLIBC),)
 	${CP} ${STAGING_TARGET_DIR}/lib/m4-nofpu/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
@@ -43,5 +44,6 @@ else
 	${CP} ${STAGING_TARGET_DIR}/lib/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
 endif
 endif
+endif
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 2 - 0
package/libpthread/Makefile

@@ -35,10 +35,12 @@ INSTALL_STYLE:=		manual
 
 libpthread-install:
 ifeq ($(ADK_TARGET_LIB_MUSL),)
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS),)
 ifeq ($(ADK_TARGET_WITH_NPTL),y)
 	${INSTALL_DIR} ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
 	${CP} ${STAGING_TARGET_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
 endif
 endif
+endif
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 2 - 0
package/librt/Makefile

@@ -31,7 +31,9 @@ INSTALL_STYLE:=		manual
 librt-install:
 	${INSTALL_DIR} ${IDIR_LIBRT}/$(ADK_TARGET_LIBC_PATH)
 ifeq ($(ADK_TARGET_LIB_MUSL),)
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS),)
 	${CP} ${STAGING_TARGET_DIR}/lib/librt*.so* ${IDIR_LIBRT}/$(ADK_TARGET_LIBC_PATH)
 endif
+endif
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk