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.
This commit is contained in:
Jason Merrill 2020-06-05 12:45:11 -04:00
parent a37fbff12c
commit ffac959725
5 changed files with 1004 additions and 1001 deletions

999
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -23,6 +23,7 @@ m4_include(config/acx.m4)
m4_include(config/override.m4)
m4_include(config/proginstall.m4)
m4_include(config/elf.m4)
m4_include(config/ax_cxx_compile_stdcxx.m4)
m4_include([libtool.m4])
m4_include([ltoptions.m4])
m4_include([ltsugar.m4])
@ -1463,9 +1464,12 @@ case "$have_compiler:$host:$target:$enable_bootstrap" in
esac
# When bootstrapping with GCC, build stage 1 in C++11 mode to ensure that a
# C++11 compiler can still start the bootstrap.
# C++11 compiler can still start the bootstrap. Otherwise, if building GCC,
# require C++11 (or higher).
if test "$enable_bootstrap:$GXX" = "yes:yes"; then
CXX="$CXX -std=c++11"
elif test "$have_compiler" = yes; then
AX_CXX_COMPILE_STDCXX(11)
fi
# Used for setting $lt_cv_objdir

1
gcc/aclocal.m4 vendored
View File

@ -18,7 +18,6 @@ m4_include([../ltsugar.m4])
m4_include([../ltversion.m4])
m4_include([../lt~obsolete.m4])
m4_include([../config/acx.m4])
m4_include([../config/ax_cxx_compile_stdcxx.m4])
m4_include([../config/cet.m4])
m4_include([../config/codeset.m4])
m4_include([../config/depstand.m4])

997
gcc/configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -386,8 +386,6 @@ AC_SUBST(PICFLAG_FOR_TARGET)
AC_USE_SYSTEM_EXTENSIONS
AX_CXX_COMPILE_STDCXX(11)
AC_PROG_CPP
AC_C_INLINE