From 45aab35c43ae443ea5802c0b80551e53939bb80b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 14 Oct 2012 08:56:58 +0200 Subject: disable multilib for uClibc --- target/config/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/config/Config.in b/target/config/Config.in index d31bd25a9..187654019 100644 --- a/target/config/Config.in +++ b/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" -- cgit v1.2.3 From ef90086b084691c19bdbca0d19e343f26c4fce6e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 14 Oct 2012 09:04:06 +0200 Subject: do not auto enable c++ when multilib, c++ build needs bugfixing --- toolchain/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 67929ec39..6f51c2367 100644 --- a/toolchain/Config.in +++ b/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)" -- cgit v1.2.3