summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2020-06-05 12:45:11 -0400
committerJason Merrill <jason@redhat.com>2020-06-08 16:42:35 -0400
commitffac9597256823612fb63bbab0f9ba3c11255e6b (patch)
treec5f0a6a6042169bbd40d9030922b138d530eb34d /configure.ac
parentlibstdc++: Fix failing tests (diff)
downloadgcc-ffac9597256823612fb63bbab0f9ba3c11255e6b.tar.gz
gcc-ffac9597256823612fb63bbab0f9ba3c11255e6b.tar.bz2
gcc-ffac9597256823612fb63bbab0f9ba3c11255e6b.tar.xz
bootstrap: Fix --disable-bootstrap with older g++.
Previously I had AX_CXX_COMPILE_STDCXX in the gcc directory configure, which added -std=c++11 to CXX if needed, but then CXX is overridden from the toplevel directory, so it didn't have the desired effect. Fixed by moving the check to the toplevel. Currently it is only used when building GCC without bootstrapping; other packages that share the toplevel directory can adjust the condition if they also want to require C++11 support. /ChangeLog: * configure.ac: Check AX_CXX_COMPILE_STDCXX if not bootstrapping. * configure: Regenerate. gcc/ChangeLog: * aclocal.m4: Remove ax_cxx_compile_stdcxx.m4. * configure.ac: Remove AX_CXX_COMPILE_STDCXX. * configure: Regenerate.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac6
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 59bd92a3e53..1a53ed418e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,6 +23,7 @@ m4_include(config/acx.m4)
23m4_include(config/override.m4) 23m4_include(config/override.m4)
24m4_include(config/proginstall.m4) 24m4_include(config/proginstall.m4)
25m4_include(config/elf.m4) 25m4_include(config/elf.m4)
26m4_include(config/ax_cxx_compile_stdcxx.m4)
26m4_include([libtool.m4]) 27m4_include([libtool.m4])
27m4_include([ltoptions.m4]) 28m4_include([ltoptions.m4])
28m4_include([ltsugar.m4]) 29m4_include([ltsugar.m4])
@@ -1463,9 +1464,12 @@ case "$have_compiler:$host:$target:$enable_bootstrap" in
1463esac 1464esac
1464 1465
1465# When bootstrapping with GCC, build stage 1 in C++11 mode to ensure that a 1466# When bootstrapping with GCC, build stage 1 in C++11 mode to ensure that a
1466# C++11 compiler can still start the bootstrap. 1467# C++11 compiler can still start the bootstrap. Otherwise, if building GCC,
1468# require C++11 (or higher).
1467if test "$enable_bootstrap:$GXX" = "yes:yes"; then 1469if test "$enable_bootstrap:$GXX" = "yes:yes"; then
1468 CXX="$CXX -std=c++11" 1470 CXX="$CXX -std=c++11"
1471elif test "$have_compiler" = yes; then
1472 AX_CXX_COMPILE_STDCXX(11)
1469fi 1473fi
1470 1474
1471# Used for setting $lt_cv_objdir 1475# Used for setting $lt_cv_objdir