diff --git a/configure b/configure
index 6a77d454fd53210e6d1969284ac9d2bf7a15b95f..41bc0d356341e73f0b6ca4ec0b755902dd874658 100755
--- a/configure
+++ b/configure
@@ -10236,6 +10236,15 @@ case "$enable_bootstrap:$ENABLE_GOLD: $configdirs :,$stage1_languages," in
     ;;
 esac
 
+# Bootstrapping GCC requires libstdc++-v3 so error out if libstdc++ is disabled with bootstrapping
+# Note C++ is always enabled for stage1 now.
+case "$enable_bootstrap:${noconfigdirs}" in
+  yes:*target-libstdc++-v3*)
+    as_fn_error $? "bootstrapping with --disable-libstdcxx is not supported" "$LINENO" 5
+    ;;
+esac
+
+
 extrasub_build=
 for module in ${build_configdirs} ; do
   if test -z "${no_recursion}" \
diff --git a/configure.ac b/configure.ac
index 2567757e74df22af368eb7004fd749ee7ec6b3ec..1cab846ab1f5f05d45ac10e3506c87127b812f3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3192,6 +3192,15 @@ case "$enable_bootstrap:$ENABLE_GOLD: $configdirs :,$stage1_languages," in
     ;;
 esac
 
+# Bootstrapping GCC requires libstdc++-v3 so error out if libstdc++ is disabled with bootstrapping
+# Note C++ is always enabled for stage1 now.
+case "$enable_bootstrap:${noconfigdirs}" in
+  yes:*target-libstdc++-v3*)
+    AC_MSG_ERROR([bootstrapping with --disable-libstdcxx is not supported])
+    ;;
+esac
+
+
 extrasub_build=
 for module in ${build_configdirs} ; do
   if test -z "${no_recursion}" \