aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>2010-11-21 01:56:30 +0000
committerIan Lance Taylor <ian@airs.com>2010-11-21 01:56:30 +0000
commit9e1a94f4a18ab83359a4cd380f3bbc90c047542a (patch)
treef35614472f91146baafea5879aebc5d6fcc3169f
parent9da4c17bba65d1adfff6f4ef32e4271be9f1049b (diff)
downloadgdb-9e1a94f4a18ab83359a4cd380f3bbc90c047542a.zip
gdb-9e1a94f4a18ab83359a4cd380f3bbc90c047542a.tar.gz
gdb-9e1a94f4a18ab83359a4cd380f3bbc90c047542a.tar.bz2
* 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.
-rw-r--r--ChangeLog6
-rw-r--r--config/ChangeLog4
-rwxr-xr-xconfigure24
-rw-r--r--configure.ac24
4 files changed, 52 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 21e5877..3a20025 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 Paolo Bonzini <bonzini@gnu.org>
* configure: Regenerate.
diff --git a/config/ChangeLog b/config/ChangeLog
index 5633e8c..8e673f7 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-19 Tobias Grosser <grosser@fim.uni-passau.de>
+
+ * cloog.m4: Use AS_HELP_STRING and fix help formatting.
+
2010-11-15 Andreas Schwab <schwab@redhat.com>
* cloog.m4 (CLOOG_INIT_FLAGS): Fix spelling in option names.
diff --git a/configure b/configure
index 847727b..a44f418 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/configure.ac b/configure.ac
index 1fd25aa..0a5c276 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.],