diff options
| author | Tristan Gingold <gingold@adacore.com> | 2010-11-24 16:27:41 +0300 |
|---|---|---|
| committer | Tristan Gingold <gingold@adacore.com> | 2010-11-24 16:27:41 +0300 |
| commit | c7c774abda26241b4bfb66a2a54de2763b49012e (patch) | |
| tree | 1d83c72413bd420458850fdb24713152629582d3 | |
| parent | aa7e04a0fa780cb7caac82a6f341762baeaed968 (diff) | |
Backport from trunk:binutils-2_21
2010-11-23 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/12258
* configure.ac: Correct comments for --enable-gold/--enable-ld.
Properly check default linker.
* configure: Regnerated.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | configure.ac | 10 |
3 files changed, 21 insertions, 6 deletions
@@ -1,3 +1,10 @@ +2010-11-23 H.J. Lu <hongjiu.lu@intel.com> + + PR binutils/12258 + * configure.ac: Correct comments for --enable-gold/--enable-ld. + Properly check default linker. + * configure: Regnerated. + 2010-11-23 Matthias Klose <doko@ubuntu.com> * configure.ac: For --enable-gold, handle value `default' instead of @@ -2839,13 +2839,17 @@ esac # Handle --enable-gold, --enable-ld. # --disable-gold [--enable-ld] # Build only ld. Default option. -# --enable-gold[=default] [--enable-ld] +# --enable-gold [--enable-ld] +# Build both gold and ld. Install gold as "ld.gold", install ld +# as "ld.bfd" and "ld". +# --enable-gold=default [--enable-ld] # Build both gold and ld. Install gold as "ld.gold" and "ld", # install ld as "ld.bfd". # --enable-gold[=default] --disable-ld # Build only gold, which is then installed as both "ld.gold" and "ld". # --enable-gold --enable-ld=default -# Build both gold (installed as "gold") and ld (installed as "ld"). +# Build both gold (installed as "ld.gold") and ld (installed as "ld" +# and ld.bfd). # In other words, ld is default # --enable-gold=default --enable-ld=default # Error. @@ -2905,7 +2909,7 @@ fi case "${ENABLE_LD}" in default) - if test x${default_ld} != xgold; then + if test x${default_ld} != x; then as_fn_error "either gold or ld can be the default ld" "$LINENO" 5 fi ;; diff --git a/configure.ac b/configure.ac index d8c886c85..19cf53f6a 100644 --- a/configure.ac +++ b/configure.ac @@ -324,13 +324,17 @@ esac # Handle --enable-gold, --enable-ld. # --disable-gold [--enable-ld] # Build only ld. Default option. -# --enable-gold[=default] [--enable-ld] +# --enable-gold [--enable-ld] +# Build both gold and ld. Install gold as "ld.gold", install ld +# as "ld.bfd" and "ld". +# --enable-gold=default [--enable-ld] # Build both gold and ld. Install gold as "ld.gold" and "ld", # install ld as "ld.bfd". # --enable-gold[=default] --disable-ld # Build only gold, which is then installed as both "ld.gold" and "ld". # --enable-gold --enable-ld=default -# Build both gold (installed as "gold") and ld (installed as "ld"). +# Build both gold (installed as "ld.gold") and ld (installed as "ld" +# and ld.bfd). # In other words, ld is default # --enable-gold=default --enable-ld=default # Error. @@ -384,7 +388,7 @@ ENABLE_LD=yes) case "${ENABLE_LD}" in default) - if test x${default_ld} != xgold; then + if test x${default_ld} != x; then AC_MSG_ERROR([either gold or ld can be the default ld]) fi ;; |