diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-10-14 10:37:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-10-14 10:37:49 +0200 |
| commit | d9b9ff251ab542ac973ca0317670191913f4db8a (patch) | |
| tree | a7517f7f198c93d95a500c97ae3cb73c83a2e706 | |
| parent | bf7aedc1d3f92992b896ca134310476596a59c6a (diff) | |
| parent | 3bc2ac4bf5b94a7478eb4be60d07238375a51a3b (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | target/config/Config.in | 3 | ||||
| -rw-r--r-- | toolchain/Config.in | 2 |
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)" |