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.

From-SVN: r151943

diff --git a/ChangeLog b/ChangeLog
index 73defe2c784ee970cd05923d70842d3ffee8b4db..596cfc774f55f549264457d5434b7fe9280e3e79 100644 (file)
--- 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 49c1786de6099eb75c4dea93258c913a585e6786..720fa239c0527fad5ae1ef17577c3017b173a20a 100755 (executable)
--- 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 55fb83051be9d5bd8725470f39816c076a854bed..794a4191d56b2f6001385fd0f55257f0225fe1a1 100644 (file)
--- 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)