mirrors/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-23 10:54:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

configure.ac: Only disable a language library if no language needs it.

Browse Source 
* configure.ac: Only disable a language library if no language needs
	it.  Don't let --disable-libgcj uncondtionally disable libffi.
	* configure: Rebuild.

From-SVN: r166993
This commit is contained in:
Ian Lance Taylor 2010-11-21 01:49:05 +00:00 committed by Ian Lance Taylor
parent 24a57808c1
commit 4da3b0f8d1
3 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2010-11-20 Ian Lance Taylor <iant@google.com>
* configure.ac: Only disable a language library if no language needs
it. Don't let --disable-libgcj uncondtionally disable libffi.
* configure: Rebuild.
2010-11-20 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.in: Regenerate.

24
configure vendored
View File

@ -2985,7 +2985,8 @@ yes)
;;
no)
# Make sure we get it printed in the list of not supported target libs.
noconfigdirs="$noconfigdirs ${libgcj}"
# Don't disable libffi, though, other languages use it.
noconfigdirs="$noconfigdirs `echo ${libgcj} | sed -e 's/target-libffi//'`"
;;
esac
@ -6177,6 +6178,9 @@ if test -d ${srcdir}/gcc; then
missing_languages=`echo ",$enable_languages," | sed -e s/,all,/,/ -e s/,c,/,/ `
potential_languages=,c,
enabled_target_libs=
disabled_target_libs=
for lang_frag in ${srcdir}/gcc/*/config-lang.in .. ; do
case ${lang_frag} in
..) ;;
@ -6254,17 +6258,20 @@ if test -d ${srcdir}/gcc; then
case $add_this_lang in
unsupported)
# Remove language-dependent dirs.
eval noconfigdirs='"$noconfigdirs "'\"$target_libs $lang_dirs\"
disabled_target_libs="$disabled_target_libs $target_libs"
noconfigdirs="$noconfigdirs $lang_dirs"
;;
no)
# Remove language-dependent dirs; still show language as supported.
eval noconfigdirs='"$noconfigdirs "'\"$target_libs $lang_dirs\"
disabled_target_libs="$disabled_target_libs $target_libs"
noconfigdirs="$noconfigdirs $lang_dirs"
potential_languages="${potential_languages}${language},"
;;
yes)
new_enable_languages="${new_enable_languages}${language},"
potential_languages="${potential_languages}${language},"
missing_languages=`echo "$missing_languages" | sed "s/,$language,/,/"`
enabled_target_libs="$enabled_target_libs $target_libs"
case "${boot_language}:,$enable_stage1_languages," in
yes:* | *:*,$language,* | *:*,yes, | *:*,all,)
# Add to (comma-separated) list of stage 1 languages.
@ -6282,6 +6289,17 @@ if test -d ${srcdir}/gcc; then
esac
done
# Add target libraries which are only needed for disabled languages
# to noconfigdirs.
if test -n "$disabled_target_libs"; then
for dir in $disabled_target_libs; do
case " $enabled_target_libs " in
*" ${dir} "*) ;;
*) noconfigdirs="$noconfigdirs $dir" ;;
esac
done
fi
# Check whether --enable-stage1-languages was given.
if test "${enable_stage1_languages+set}" = set; then :
enableval=$enable_stage1_languages; case ,${enable_stage1_languages}, in

24
configure.ac
View File

@ -451,7 +451,8 @@ yes)
;;
no)
# Make sure we get it printed in the list of not supported target libs.
noconfigdirs="$noconfigdirs ${libgcj}"
# Don't disable libffi, though, other languages use it.
noconfigdirs="$noconfigdirs `echo ${libgcj} | sed -e 's/target-libffi//'`"
;;
esac
@ -1765,6 +1766,9 @@ if test -d ${srcdir}/gcc; then
missing_languages=`echo ",$enable_languages," | sed -e s/,all,/,/ -e s/,c,/,/ `
potential_languages=,c,
enabled_target_libs=
disabled_target_libs=
for lang_frag in ${srcdir}/gcc/*/config-lang.in .. ; do
case ${lang_frag} in
..) ;;
@ -1842,17 +1846,20 @@ if test -d ${srcdir}/gcc; then
case $add_this_lang in
unsupported)
# Remove language-dependent dirs.
eval noconfigdirs='"$noconfigdirs "'\"$target_libs $lang_dirs\"
disabled_target_libs="$disabled_target_libs $target_libs"
noconfigdirs="$noconfigdirs $lang_dirs"
;;
no)
# Remove language-dependent dirs; still show language as supported.
eval noconfigdirs='"$noconfigdirs "'\"$target_libs $lang_dirs\"
disabled_target_libs="$disabled_target_libs $target_libs"
noconfigdirs="$noconfigdirs $lang_dirs"
potential_languages="${potential_languages}${language},"
;;
yes)
new_enable_languages="${new_enable_languages}${language},"
potential_languages="${potential_languages}${language},"
missing_languages=`echo "$missing_languages" | sed "s/,$language,/,/"`
enabled_target_libs="$enabled_target_libs $target_libs"
case "${boot_language}:,$enable_stage1_languages," in
yes:* | *:*,$language,* | *:*,yes, | *:*,all,)
# Add to (comma-separated) list of stage 1 languages.
@ -1870,6 +1877,17 @@ if test -d ${srcdir}/gcc; then
esac
done
# Add target libraries which are only needed for disabled languages
# to noconfigdirs.
if test -n "$disabled_target_libs"; then
for dir in $disabled_target_libs; do
case " $enabled_target_libs " in
*" ${dir} "*) ;;
*) noconfigdirs="$noconfigdirs $dir" ;;
esac
done
fi
AC_ARG_ENABLE(stage1-languages,
[ --enable-stage1-languages@<:@=all@:>@ choose additional languages to build during
stage1. Mostly useful for compiler development.],