From 14b1dc5940bd35637fd901418fbf6c2fe1974fec Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Mon, 8 Oct 2012 23:12:28 +0200
Subject: finetune multilib support a lot, cleanup eglibc/glibc Makefiles while
 there

---
 target/config/Config.in | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

(limited to 'target/config')

diff --git a/target/config/Config.in b/target/config/Config.in
index 32a254900..db7f09a5d 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -92,14 +92,17 @@ depends on ADK_TARGET_KERNEL64 && ADK_LINUX_X86_64
 config ADK_TARGET_ABI_64
 	boolean "64 Bit ABI"
 	select ADK_64
+	select ADK_TARGET_MULTILIB_X86_64 if ADK_TARGET_WITH_MULTILIB
 
 config ADK_TARGET_ABI_X32
 	boolean "x32 ABI (new)"
 	select ADK_x32
+	select ADK_TARGET_MULTILIB_X86_X32 if ADK_TARGET_WITH_MULTILIB
 
 config ADK_TARGET_ABI_32
 	boolean "32 Bit ABI"
 	select ADK_32
+	select ADK_TARGET_MULTILIB_X86_32 if ADK_TARGET_WITH_MULTILIB
 
 endchoice
 
@@ -126,32 +129,17 @@ config ADK_TARGET_WITH_MULTILIB
 config ADK_TARGET_MULTILIB_X86_64
 	boolean "64 bit libraries"
 	depends on ADK_LINUX_X86_64 && ADK_TARGET_WITH_MULTILIB
-	default y
+	default y if ADK_64
 	
 config ADK_TARGET_MULTILIB_X86_32
 	boolean "32 bit libraries"
 	depends on ADK_LINUX_X86_64 && ADK_TARGET_WITH_MULTILIB
+	default y if ADK_32
 
 config ADK_TARGET_MULTILIB_X86_X32
 	boolean "x32 bit libraries"
 	depends on ADK_LINUX_X86_64 && ADK_TARGET_WITH_MULTILIB
-
-choice
-prompt "Default Library (compile all applications with this library)"
-config ADK_TARGET_MULTILIB_X86_64_DEF
-	boolean "64 Bit libraries as default"
-	depends on ADK_TARGET_MULTILIB_X86_64
-
-config ADK_TARGET_MULTILIB_X86_32_DEF
-	boolean "32 Bit libraries as default"
-	depends on ADK_TARGET_MULTILIB_X86_32
-
-config ADK_TARGET_MULTILIB_X86_X32_DEF
-	boolean "x32 Bit libraries as default"
-	depends on ADK_TARGET_MULTILIB_X86_X32
-
-endchoice
-endmenu
+	default y if ADK_x32
 
 config ADK_MULTILIB_TARGET
 	string
@@ -178,6 +166,8 @@ config ADK_MULTILIB_TARGET
 			&& ADK_TARGET_MULTILIB_X86_X32
 	
 
+endmenu
+
 # submodel support
 #
 choice
-- 
cgit v1.2.3