diff options
author | Nick Clifton <nickc@redhat.com> | 2010-11-23 13:39:56 +0000 |
---|---|---|
committer | Nick Clifton <nickc@redhat.com> | 2010-11-23 13:39:56 +0000 |
commit | 1ea28f93096b52e567354608f1dadc6a40745c23 (patch) | |
tree | d5e54a237b2c80ed6c28cc11e15efa002ab4c8fc /gold/configure.ac | |
parent | 08b3718ebbc98dd4abdb34b535ae180c93faa450 (diff) | |
download | binutils-redhat-1ea28f93096b52e567354608f1dadc6a40745c23.tar.gz |
* configure.ac: For --enable-gold, handle value `default' instead of
`both*'. New configure option --{en,dis}able-ld.
ld, gold/
* configure.ac: For --enable-gold, handle value `default' instead of
`both*'. Always install ld as ld.gold, install as ld if gold is
the default.
Diffstat (limited to 'gold/configure.ac')
-rw-r--r-- | gold/configure.ac | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/gold/configure.ac b/gold/configure.ac index 8bd80faf2d..2c50d9741c 100644 --- a/gold/configure.ac +++ b/gold/configure.ac @@ -41,27 +41,33 @@ AC_DEFINE_UNQUOTED(TARGET_SYSTEM_ROOT_RELOCATABLE, $sysroot_relocatable, dnl "install_as_default" is true if the linker to be installed as the dnl default linker, ld. dnl "installed_linker" is the installed gold linker name. -AC_ARG_ENABLE(gold, -[[ --enable-gold[=ARG] build gold [ARG={both}[/{gold,ld}]]]], + +default_ld= +AC_ARG_ENABLE(ld, +[[ --enable-ld[=ARG] build ld [ARG={default,yes,no}]]], [case "${enableval}" in - yes) - install_as_default=gold - installed_linker=ld - ;; - both/gold) - install_as_default=yes + default) + default_ld=ld.bfd + ;; +esac]) + +AC_ARG_ENABLE(gold, +[[ --enable-gold[=ARG] build gold [ARG={default,yes,no}]]], +[case "${enableval}" in + yes|default) + if test x${default_ld} = x; then + install_as_default=yes + fi installed_linker=ld.gold ;; - both|both/ld) - install_as_default=no - installed_linker=ld.gold + no) ;; *) AC_MSG_ERROR([invalid --enable-gold argument]) ;; esac], -[install_as_default=gold - installed_linker=ld]) +[install_as_default=no + installed_linker=ld.gold]) AC_SUBST(install_as_default) AC_SUBST(installed_linker) |