Bootstrapping and using --disable-libstdcxx will cause a build failure deep in 
compiling
stage2 so instead error out early in the toplevel configure so it is more user 
friendly.

Bootstrapped and tested on x86_64-linux-gnu.
Also made sure --disable-libstdcxx without --disable-bootstrap failed.

        PR bootstrap/105474

ChangeLog:

        * configure: Regenerate.
        * configure.ac: Error out if libstdc++ is not enabled
        with bootstrapping.

Signed-off-by: Andrew Pinski <quic_apin...@quicinc.com>
---
 configure    | 9 +++++++++
 configure.ac | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/configure b/configure
index 51bf1d1add1..0722242389d 100755
--- a/configure
+++ b/configure
@@ -10235,6 +10235,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 20457005e29..8be11e84db8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3191,6 +3191,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}" \
-- 
2.43.0

Reply via email to