# HG changeset patch # User "Yann E. MORIN" # Date 1301867097 -7200 # Node ID edbd46e8bb97fdfecce92e8077f63090a6dd3059 # Parent 148e80538623dd4fdb7895546138eabaf5712518 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 -r 148e80538623 -r edbd46e8bb97 config/binutils/binutils.in --- a/config/binutils/binutils.in Tue Apr 05 01:17:58 2011 +0200 +++ b/config/binutils/binutils.in Sun Apr 03 23:44:57 2011 +0200 @@ -80,8 +80,6 @@ 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 @@ 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 @@ 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 @@ 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_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