From f8dc745f6ef4f1a50abcafcda67694104a634b86 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Mon, 21 Sep 2009 20:31:02 +0000 Subject: [PATCH] toplevel configure: bootstrap target_libs of stage1_languages. /: * configure.ac: Also add target_libs of stage1_languages to bootstrap_target_libs. * configure: Regenerate. --- ChangeLog | 4 ++++ configure | 9 ++++++--- configure.ac | 9 ++++++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca58d0d8731..f99c9c83920 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2009-09-21 Ralf Wildenhues + * configure.ac: Also add target_libs of stage1_languages to + bootstrap_target_libs. + * configure: Regenerate. + * configure.ac: Diagnose --enable-build-with-cxx bootstrap with --enable-languages not containing c++. * configure: Regenerate. diff --git a/configure b/configure index df2b37f5670..49c1786de60 100755 --- a/configure +++ b/configure @@ -5819,10 +5819,13 @@ if test -d ${srcdir}/gcc; then new_enable_languages="${new_enable_languages}${language}," potential_languages="${potential_languages}${language}," missing_languages=`echo "$missing_languages" | sed "s/,$language,/,/"` - case ${boot_language} in - yes) + case "${boot_language}:,$enable_stage1_languages," in + yes:* | *:*,$language,* | *:*,yes, | *:*,all,) # Add to (comma-separated) list of stage 1 languages. - stage1_languages="${stage1_languages}${language}," + case ",$stage1_languages," in + *,$language,* | ,yes, | ,all,) ;; + *) stage1_languages="${stage1_languages}${language}," ;; + esac # We need to bootstrap any supporting libraries. bootstrap_target_libs="${bootstrap_target_libs}${target_libs}," ;; diff --git a/configure.ac b/configure.ac index a8fb3b79714..55fb83051be 100644 --- a/configure.ac +++ b/configure.ac @@ -1763,10 +1763,13 @@ if test -d ${srcdir}/gcc; then new_enable_languages="${new_enable_languages}${language}," potential_languages="${potential_languages}${language}," missing_languages=`echo "$missing_languages" | sed "s/,$language,/,/"` - case ${boot_language} in - yes) + case "${boot_language}:,$enable_stage1_languages," in + yes:* | *:*,$language,* | *:*,yes, | *:*,all,) # Add to (comma-separated) list of stage 1 languages. - stage1_languages="${stage1_languages}${language}," + case ",$stage1_languages," in + *,$language,* | ,yes, | ,all,) ;; + *) stage1_languages="${stage1_languages}${language}," ;; + esac # We need to bootstrap any supporting libraries. bootstrap_target_libs="${bootstrap_target_libs}${target_libs}," ;; -- 2.30.2