diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | configure.ac | 7 |
3 files changed, 18 insertions, 0 deletions
@@ -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. @@ -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 55fb83051..794a4191d 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) |