From 4385ad3c0987c92590d3c30bbb19da53574be01b Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Mon, 21 Sep 2009 19:25:05 +0000 Subject: [PATCH] Diagnose --enable-build-with-cxx --enable-bootstrap --enable-languages w/o c++ /: * configure.ac: Diagnose --enable-build-with-cxx bootstrap with --enable-languages not containing c++. * configure: Regenerate. --- ChangeLog | 6 ++++++ configure | 7 +++++++ configure.ac | 7 +++++++ 3 files changed, 20 insertions(+) diff --git a/ChangeLog b/ChangeLog index fdfa5c92d2c..ca58d0d8731 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-09-21 Ralf Wildenhues + + * configure.ac: Diagnose --enable-build-with-cxx bootstrap + with --enable-languages not containing c++. + * configure: Regenerate. + 2009-09-16 Jie Zhang * configure.ac: Disable java and boehm-gc for bfin-*-*. diff --git a/configure b/configure index 6119983307a..df2b37f5670 100755 --- a/configure +++ b/configure @@ -6574,6 +6574,13 @@ $as_echo "$as_me: WARNING: trying to bootstrap a cross compiler" >&2;} ;; esac +case ",$enable_languages,:$ENABLE_BUILD_WITH_CXX:$enable_bootstrap" in + *,c++,*:yes:yes) ;; + *:yes:yes) + as_fn_error "bootstrapping with --enable-build-with-cxx requires c++ in --enable-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 f3d511973ce..a8fb3b79714 100644 --- a/configure.ac +++ b/configure.ac @@ -2460,6 +2460,13 @@ case "$have_compiler:$host:$target:$enable_bootstrap" in ;; esac +case ",$enable_languages,:$ENABLE_BUILD_WITH_CXX:$enable_bootstrap" in + *,c++,*:yes:yes) ;; + *:yes:yes) + AC_MSG_ERROR([bootstrapping with --enable-build-with-cxx requires c++ in --enable-languages]) + ;; +esac + # Adjust the toplevel makefile according to whether bootstrap was selected. case $enable_bootstrap in yes) -- 2.30.2