diff options
| author | Ian Lance Taylor <ian@airs.com> | 2010-11-21 01:56:30 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 2010-11-21 01:56:30 +0000 |
| commit | 9e1a94f4a18ab83359a4cd380f3bbc90c047542a (patch) | |
| tree | f35614472f91146baafea5879aebc5d6fcc3169f /configure.ac | |
| parent | 9da4c17bba65d1adfff6f4ef32e4271be9f1049b (diff) | |
| download | binutils-gdb-9e1a94f4a18ab83359a4cd380f3bbc90c047542a.tar.gz | |
* configure.ac: Only disable a language library if no language needs
it. Don't let --disable-libgcj uncondtionally disable libffi.
* configure: Rebuild.
Also moved ChangeLog entry to correct file.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 1fd25aa48b0..0a5c276a033 100644 --- a/configure.ac +++ b/configure.ac @@ -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.], |