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

target/config/Config.in

@@ -122,7 +122,8 @@ config ADK_TARGET_LIBC_PATH
 
 menu "Target multilib support"
 depends on ADK_TARGET_KERNEL64 && \
-	( ADK_LINUX_X86_64 || ADK_LINUX_MIPS )
+	( ADK_LINUX_X86_64 || ADK_LINUX_MIPS ) && \
+	( ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_GLIBC )
 
 config ADK_TARGET_WITH_MULTILIB 
 	boolean "multilib support"

toolchain/Config.in

@@ -13,7 +13,7 @@ config ADK_TOOLCHAIN_GDB
 config ADK_TOOLCHAIN_GCC_CXX
 	prompt "Enable building of G++ (C++ language support in GCC)"
 	boolean
-	default y
+	default y if !ADK_TARGET_WITH_MULTILIB
 
 #config ADK_TOOLCHAIN_GCC_JAVA
 #	prompt "Enable building of GCJ (Java language support in GCC)"