Merge branch 'master' of git+ssh://openadk.org/git/openadk

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

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

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

target/config/Config.in.toolchain

@@ -12,7 +12,6 @@ config ADK_VENDOR
 
 choice
 prompt "GCC version"
-depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH
 
 config ADK_TOOLCHAIN_GCC_4_5_4
 	prompt "4.5.4"
@@ -216,5 +215,4 @@ config ADK_UCLIBC_TEST
 	depends on ADK_TARGET_LIB_UCLIBC_NG || ADK_TARGET_LIB_UCLIBC
 	default y
 
-
 endmenu