Require c++ in stage1_languages with --enable-gold in combined bootstrap.

/:
	* configure.ac: If bootstrapping a combined tree with
	--enable-gold, require c++ in stage1_languages.
	* configure: Regenerate.

3 files changed, 18 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index f99c9c8..e3d0ce7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-09-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	* configure.ac: If bootstrapping a combined tree with
+	--enable-gold, require c++ in stage1_languages.
+	* configure: Regenerate.
+
 	* configure.ac: Also add target_libs of stage1_languages to
 	bootstrap_target_libs.
 	* configure: Regenerate.
diff --git a/configure b/configure
index 49c1786..720fa23 100755
--- a/configure
+++ b/configure
@@ -6584,6 +6584,13 @@ case ",$enable_languages,:$ENABLE_BUILD_WITH_CXX:$enable_bootstrap" in
     ;;
 esac
 
+case "$enable_bootstrap:$ENABLE_GOLD: $configdirs :,$stage1_languages," in
+  yes:yes:*\ gold\ *:*,c++,*) ;;
+  yes:yes:*\ gold\ *:*)
+    as_fn_error "in a combined tree, bootstrapping with --enable-gold requires c++ in stage1_languages" "$LINENO" 5
+    ;;
+esac
+
 # Adjust the toplevel makefile according to whether bootstrap was selected.
 case $enable_bootstrap in
   yes)
diff --git a/configure.ac b/configure.ac
index 55fb830..794a419 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2470,6 +2470,13 @@ case ",$enable_languages,:$ENABLE_BUILD_WITH_CXX:$enable_bootstrap" in
     ;;
 esac
 
+case "$enable_bootstrap:$ENABLE_GOLD: $configdirs :,$stage1_languages," in
+  yes:yes:*\ gold\ *:*,c++,*) ;;
+  yes:yes:*\ gold\ *:*)
+    AC_MSG_ERROR([in a combined tree, bootstrapping with --enable-gold requires c++ in stage1_languages])
+    ;;
+esac
+
 # Adjust the toplevel makefile according to whether bootstrap was selected.
 case $enable_bootstrap in
   yes)