aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rwxr-xr-xconfigure7
-rw-r--r--configure.ac7
3 files changed, 20 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fdfa5c9..ca58d0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-21 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ * configure.ac: Diagnose --enable-build-with-cxx bootstrap
+ with --enable-languages not containing c++.
+ * configure: Regenerate.
+
2009-09-16 Jie Zhang <jie.zhang@analog.com>
* configure.ac: Disable java and boehm-gc for bfin-*-*.
diff --git a/configure b/configure
index 6119983..df2b37f 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 f3d5119..a8fb3b7 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)