diff options
author | Ian Lance Taylor <iant@google.com> | 2010-11-18 17:44:11 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2010-11-18 17:44:11 +0000 |
commit | 69ecd18fb9c7826cc295109240744ab3ec586187 (patch) | |
tree | 8558f6d15dcbcb8469dfcbadb7eb44e12c7d04de | |
parent | 5e8c4585db67a91d56a22463a06dcf178c6a92ba (diff) | |
download | gcc-69ecd18fb9c7826cc295109240744ab3ec586187.zip gcc-69ecd18fb9c7826cc295109240744ab3ec586187.tar.gz gcc-69ecd18fb9c7826cc295109240744ab3ec586187.tar.bz2 |
configure.ac: Check for lang_requires_boot_languages in config-lang.in files.
* configure.ac: Check for lang_requires_boot_languages in
config-lang.in files.
* configure: Rebuild.
From-SVN: r166914
-rw-r--r-- | ChangeLog | 6 | ||||
-rwxr-xr-x | configure | 22 | ||||
-rw-r--r-- | configure.ac | 22 |
3 files changed, 46 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2010-11-18 Ian Lance Taylor <iant@google.com> + + * configure.ac: Check for lang_requires_boot_languages in + config-lang.in files. + * configure: Rebuild. + 2010-11-16 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> Tobias Burnus <burnus@net-b.de> @@ -6115,11 +6115,13 @@ if test -d ${srcdir}/gcc; then # an apparent bug in bash 1.12 on linux. ${srcdir}/gcc/[*]/config-lang.in) ;; *) - # From the config-lang.in, get $language, $lang_requires + # From the config-lang.in, get $language, $lang_requires, and + # $lang_requires_boot_languages. language= lang_requires= + lang_requires_boot_languages= . ${lang_frag} - for other in ${lang_requires} ; do + for other in ${lang_requires} ${lang_requires_boot_languages}; do case ,${enable_languages}, in *,$other,*) ;; *,all,*) ;; @@ -6129,6 +6131,22 @@ if test -d ${srcdir}/gcc; then ;; esac done + for other in ${lang_requires_boot_languages} ; do + if test "$other" != "c"; then + case ,${enable_stage1_languages}, in + *,$other,*) ;; + *,all,*) ;; + *) + case ,${enable_languages}, in + *,$language,*) + echo " '$other' language required by '$language' in stage 1; enabling" 1>&2 + enable_stage1_languages="$enable_stage1_languages,${other}" + ;; + esac + ;; + esac + fi + done ;; esac done diff --git a/configure.ac b/configure.ac index 08f5331..7d023c8 100644 --- a/configure.ac +++ b/configure.ac @@ -1707,11 +1707,13 @@ if test -d ${srcdir}/gcc; then # an apparent bug in bash 1.12 on linux. ${srcdir}/gcc/[[*]]/config-lang.in) ;; *) - # From the config-lang.in, get $language, $lang_requires + # From the config-lang.in, get $language, $lang_requires, and + # $lang_requires_boot_languages. language= lang_requires= + lang_requires_boot_languages= . ${lang_frag} - for other in ${lang_requires} ; do + for other in ${lang_requires} ${lang_requires_boot_languages}; do case ,${enable_languages}, in *,$other,*) ;; *,all,*) ;; @@ -1721,6 +1723,22 @@ if test -d ${srcdir}/gcc; then ;; esac done + for other in ${lang_requires_boot_languages} ; do + if test "$other" != "c"; then + case ,${enable_stage1_languages}, in + *,$other,*) ;; + *,all,*) ;; + *) + case ,${enable_languages}, in + *,$language,*) + echo " '$other' language required by '$language' in stage 1; enabling" 1>&2 + enable_stage1_languages="$enable_stage1_languages,${other}" + ;; + esac + ;; + esac + fi + done ;; esac done |