diff options
| author | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-09-21 20:32:37 +0000 |
|---|---|---|
| committer | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-09-21 20:32:37 +0000 |
| commit | 7b5fee3edd77803ca6c5b0ed9d4c06a556d14450 (patch) | |
| tree | 1a1eaf6129d632a497fcaaef6f718f36be42a4eb | |
| parent | 320274464faa824e792ee706c89f658c0a939567 (diff) | |
| download | gcc-7b5fee3edd77803ca6c5b0ed9d4c06a556d14450.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151943 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | configure.ac | 7 |
3 files changed, 18 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 73defe2c784..596cfc774f5 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 49c1786de60..720fa239c05 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 55fb83051be..794a4191d56 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) |