From 69ecd18fb9c7826cc295109240744ab3ec586187 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@google.com>
Date: Thu, 18 Nov 2010 17:44:11 +0000
Subject: [PATCH] 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
---
ChangeLog | 6 ++++++
configure | 22 ++++++++++++++++++++--
configure.ac | 22 ++++++++++++++++++++--
3 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 49f52afaaacd..353ab65ef600 100644
--- 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>
diff --git a/configure b/configure
index 04a623c2de93..b1235c2afa25 100755
--- 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
diff --git a/configure.ac b/configure.ac
index 08f533109a68..7d023c8acefa 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
--
GitLab