* configure.ac: Check for lang_requires_boot_languages in
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 18 Nov 2010 17:44:11 +0000 (17:44 +0000)
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 18 Nov 2010 17:44:11 +0000 (17:44 +0000)
config-lang.in files.
* configure: Rebuild.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@166914 138bc75d-0d04-0410-961f-82ee72b054a4

ChangeLog
configure
configure.ac

index 49f52af..353ab65 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
index 04a623c..b1235c2 100755 (executable)
--- a/configure
+++ b/configure
@@ -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
index 08f5331..7d023c8 100644 (file)
@@ -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