summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--target/config/Config.in3
-rw-r--r--toolchain/Config.in2
2 files changed, 3 insertions, 2 deletions
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"
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)"