From 48b22a3f05df203c40a6f953aaa0acf828aad9a9 Mon Sep 17 00:00:00 2001
From: Andrew Pinski <quic_apinski@quicinc.com>
Date: Thu, 22 Aug 2024 14:34:03 -0700
Subject: [PATCH] toplevel: Error out if using --disable-libstdcxx with
bootstrap [PR105474]
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_apinski@quicinc.com>
---
configure | 9 +++++++++
configure.ac | 9 +++++++++
2 files changed, 18 insertions(+)
diff --git a/configure b/configure
index 6a77d454fd53..41bc0d356341 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 2567757e74df..1cab846ab1f5 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}" \
--
GitLab