configure.ac: For --enable-gold, handle value default' instead of both*'.
2010-11-23 Matthias Klose <doko@ubuntu.com>
* configure.ac: For --enable-gold, handle value `default' instead of
`both*'. New configure option --{en,dis}able-ld.
* configure: Regenerate.
From-SVN: r167076
This commit is contained in:
Matthias Klose
Matthias Klose
parent
39c4e2985d
commit
21539e2eb2
@ -1,3 +1,9 @@
|
||||
2010-11-23 Matthias Klose <doko@ubuntu.com>
|
||||
|
||||
* configure.ac: For --enable-gold, handle value `default' instead of
|
||||
`both*'. New configure option --{en,dis}able-ld.
|
||||
* configure: Regenerate.
|
||||
|
||||
2010-11-20 Ian Lance Taylor <iant@google.com>
|
||||
|
||||
* configure.ac: Only disable a language library if no language needs
|
||||
|
||||
70
configure
vendored
70
configure
vendored
@ -741,6 +741,7 @@ ac_user_opts='
|
||||
enable_option_checking
|
||||
with_build_libsubdir
|
||||
enable_gold
|
||||
enable_ld
|
||||
enable_libada
|
||||
enable_libssp
|
||||
enable_build_with_cxx
|
||||
@ -1450,7 +1451,8 @@ Optional Features:
|
||||
--disable-option-checking ignore unrecognized --enable/--with options
|
||||
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
|
||||
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
|
||||
--enable-gold[=ARG] build gold [ARG={both}[/{gold,ld}]]
|
||||
--enable-gold[=ARG] build gold [ARG={default,yes,no}]
|
||||
--enable-ld[=ARG] build ld [ARG={default,yes,no}]
|
||||
--enable-libada build libada directory
|
||||
--enable-libssp build libssp directory
|
||||
--enable-build-with-cxx build with C++ compiler instead of C compiler
|
||||
@ -2849,13 +2851,21 @@ case ${with_newlib} in
|
||||
yes) skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` ;;
|
||||
esac
|
||||
|
||||
# Handle --enable-gold.
|
||||
# --enable-gold Build only gold
|
||||
# --disable-gold [default] Build only ld
|
||||
# --enable-gold=both Build both gold and ld, ld is default
|
||||
# --enable-gold=both/ld Same
|
||||
# --enable-gold=both/gold Build both gold and ld, gold is default, ld is renamed ld.bfd
|
||||
# Handle --enable-gold, --enable-ld.
|
||||
# --disable-gold [--enable-ld]
|
||||
# Build only ld. Default option.
|
||||
# --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").
|
||||
# In other words, ld is default
|
||||
# --enable-gold=default --enable-ld=default
|
||||
# Error.
|
||||
|
||||
default_ld=
|
||||
# Check whether --enable-gold was given.
|
||||
if test "${enable_gold+set}" = set; then :
|
||||
enableval=$enable_gold; ENABLE_GOLD=$enableval
|
||||
@ -2863,8 +2873,8 @@ else
|
||||
ENABLE_GOLD=no
|
||||
fi
|
||||
|
||||
case "${ENABLE_GOLD}" in
|
||||
yes|both|both/gold|both/ld)
|
||||
case "${ENABLE_GOLD}" in
|
||||
yes|default)
|
||||
# Check for ELF target.
|
||||
is_elf=no
|
||||
case "${target}" in
|
||||
@ -2884,14 +2894,10 @@ fi
|
||||
# Check for target supported by gold.
|
||||
case "${target}" in
|
||||
i?86-*-* | x86_64-*-* | sparc*-*-* | powerpc*-*-* | arm*-*-*)
|
||||
case "${ENABLE_GOLD}" in
|
||||
both*)
|
||||
configdirs="$configdirs gold"
|
||||
;;
|
||||
*)
|
||||
configdirs=`echo " ${configdirs} " | sed -e 's/ ld / gold /'`
|
||||
;;
|
||||
esac
|
||||
configdirs="$configdirs gold"
|
||||
if test x${ENABLE_GOLD} = xdefault; then
|
||||
default_ld=gold
|
||||
fi
|
||||
ENABLE_GOLD=yes
|
||||
;;
|
||||
esac
|
||||
@ -2902,7 +2908,35 @@ fi
|
||||
*)
|
||||
as_fn_error "invalid --enable-gold argument" "$LINENO" 5
|
||||
;;
|
||||
esac
|
||||
esac
|
||||
|
||||
# Check whether --enable-ld was given.
|
||||
if test "${enable_ld+set}" = set; then :
|
||||
enableval=$enable_ld; ENABLE_LD=$enableval
|
||||
else
|
||||
ENABLE_LD=yes
|
||||
fi
|
||||
|
||||
|
||||
case "${ENABLE_LD}" in
|
||||
default)
|
||||
if test x${default_ld} != xgold; then
|
||||
as_fn_error "either gold or ld can be the default ld" "$LINENO" 5
|
||||
fi
|
||||
;;
|
||||
yes)
|
||||
;;
|
||||
no)
|
||||
if test x${ENABLE_GOLD} != xyes; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: neither ld nor gold are enabled" >&5
|
||||
$as_echo "$as_me: WARNING: neither ld nor gold are enabled" >&2;}
|
||||
fi
|
||||
configdirs=`echo " ${configdirs} " | sed -e 's/ ld / /'`
|
||||
;;
|
||||
*)
|
||||
as_fn_error "invalid --enable-ld argument" "$LINENO" 5
|
||||
;;
|
||||
esac
|
||||
|
||||
# Configure extra directories which are host specific
|
||||
|
||||
|
||||
64
configure.ac
64
configure.ac
@ -324,19 +324,27 @@ case ${with_newlib} in
|
||||
yes) skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` ;;
|
||||
esac
|
||||
|
||||
# Handle --enable-gold.
|
||||
# --enable-gold Build only gold
|
||||
# --disable-gold [default] Build only ld
|
||||
# --enable-gold=both Build both gold and ld, ld is default
|
||||
# --enable-gold=both/ld Same
|
||||
# --enable-gold=both/gold Build both gold and ld, gold is default, ld is renamed ld.bfd
|
||||
# Handle --enable-gold, --enable-ld.
|
||||
# --disable-gold [--enable-ld]
|
||||
# Build only ld. Default option.
|
||||
# --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").
|
||||
# In other words, ld is default
|
||||
# --enable-gold=default --enable-ld=default
|
||||
# Error.
|
||||
|
||||
default_ld=
|
||||
AC_ARG_ENABLE(gold,
|
||||
[[ --enable-gold[=ARG] build gold [ARG={both}[/{gold,ld}]]]],
|
||||
[[ --enable-gold[=ARG] build gold [ARG={default,yes,no}]]],
|
||||
ENABLE_GOLD=$enableval,
|
||||
ENABLE_GOLD=no)
|
||||
case "${ENABLE_GOLD}" in
|
||||
yes|both|both/gold|both/ld)
|
||||
case "${ENABLE_GOLD}" in
|
||||
yes|default)
|
||||
# Check for ELF target.
|
||||
is_elf=no
|
||||
case "${target}" in
|
||||
@ -356,14 +364,10 @@ ENABLE_GOLD=no)
|
||||
# Check for target supported by gold.
|
||||
case "${target}" in
|
||||
i?86-*-* | x86_64-*-* | sparc*-*-* | powerpc*-*-* | arm*-*-*)
|
||||
case "${ENABLE_GOLD}" in
|
||||
both*)
|
||||
configdirs="$configdirs gold"
|
||||
;;
|
||||
*)
|
||||
configdirs=`echo " ${configdirs} " | sed -e 's/ ld / gold /'`
|
||||
;;
|
||||
esac
|
||||
configdirs="$configdirs gold"
|
||||
if test x${ENABLE_GOLD} = xdefault; then
|
||||
default_ld=gold
|
||||
fi
|
||||
ENABLE_GOLD=yes
|
||||
;;
|
||||
esac
|
||||
@ -374,7 +378,31 @@ ENABLE_GOLD=no)
|
||||
*)
|
||||
AC_MSG_ERROR([invalid --enable-gold argument])
|
||||
;;
|
||||
esac
|
||||
esac
|
||||
|
||||
AC_ARG_ENABLE(ld,
|
||||
[[ --enable-ld[=ARG] build ld [ARG={default,yes,no}]]],
|
||||
ENABLE_LD=$enableval,
|
||||
ENABLE_LD=yes)
|
||||
|
||||
case "${ENABLE_LD}" in
|
||||
default)
|
||||
if test x${default_ld} != xgold; then
|
||||
AC_MSG_ERROR([either gold or ld can be the default ld])
|
||||
fi
|
||||
;;
|
||||
yes)
|
||||
;;
|
||||
no)
|
||||
if test x${ENABLE_GOLD} != xyes; then
|
||||
AC_MSG_WARN([neither ld nor gold are enabled])
|
||||
fi
|
||||
configdirs=`echo " ${configdirs} " | sed -e 's/ ld / /'`
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR([invalid --enable-ld argument])
|
||||
;;
|
||||
esac
|
||||
|
||||
# Configure extra directories which are host specific
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user