From 6f2778eb02edf5e8b2115e01c8e0f6026025a228 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 3 Apr 2011 23:44:57 +0200 Subject: binutils/binutils: always set name of the default linker Always export the name of the default linker, even if only one of them is selected. Signed-off-by: "Yann E. MORIN" diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in index 508780b..29b9b4c 100644 --- a/config/binutils/binutils.in +++ b/config/binutils/binutils.in @@ -80,8 +80,6 @@ config ARCH_arm config ARCH_x86 select BINUTILS_GOLD_SUPPORTS_ARCH -if BINUTILS_HAS_GOLD && BINUTILS_GOLD_SUPPORTS_ARCH - choice bool prompt "Linkers to enable" @@ -96,6 +94,7 @@ config BINUTILS_LINKER_GOLD bool prompt "gold" depends on BINUTILS_HAS_GOLD + depends on BINUTILS_GOLD_SUPPORTS_ARCH depends on EXPERIMENTAL select BINUTILS_GOLD_INSTALLED help @@ -108,6 +107,7 @@ config BINUTILS_LINKER_LD_GOLD bool prompt "ld, gold" depends on BINUTILS_HAS_GOLD + depends on BINUTILS_GOLD_SUPPORTS_ARCH depends on EXPERIMENTAL select BINUTILS_GOLD_INSTALLED select BINUTILS_LINKER_BOTH @@ -121,6 +121,7 @@ config BINUTILS_LINKER_GOLD_LD bool prompt "gold, ld" depends on BINUTILS_HAS_GOLD + depends on BINUTILS_GOLD_SUPPORTS_ARCH depends on EXPERIMENTAL select BINUTILS_GOLD_INSTALLED select BINUTILS_LINKER_BOTH @@ -168,11 +169,8 @@ config BINUTILS_LD_WRAPPER config BINUTILS_LINKER_DEFAULT string - depends on BINUTILS_LD_WRAPPER - default "bfd" if BINUTILS_LINKER_LD_GOLD - default "gold" if BINUTILS_LINKER_GOLD_LD - -endif # BINUTILS_HAS_GOLD + default "bfd" if BINUTILS_LINKER_LD || BINUTILS_LINKER_LD_GOLD + default "gold" if BINUTILS_LINKER_GOLD || BINUTILS_LINKER_GOLD_LD config BINUTILS_PLUGINS bool -- cgit v0.10.2-6-g49f6