From 460704884ffa0cdd637b726ce53524c6a2c9ef79 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 26 May 2015 08:29:13 -0400 Subject: [PATCH] configure.ac: When bootstrapping with GCC, add -std=c++98 to CXX. * configure.ac: When bootstrapping with GCC, add -std=c++98 to CXX. * configure: Regenerate. From-SVN: r223692 --- ChangeLog | 5 +++++ configure | 6 ++++++ configure.ac | 6 ++++++ 3 files changed, 17 insertions(+) diff --git a/ChangeLog b/ChangeLog index d742bf253d04..1a06c97419d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-05-26 Jason Merrill + + * configure.ac: When bootstrapping with GCC, add -std=c++98 to CXX. + * configure: Regenerate. + 2015-05-16 James Bowman * configure.ac: FT32 target added. diff --git a/configure b/configure index d8043298ad09..633afa405a41 100755 --- a/configure +++ b/configure @@ -5407,6 +5407,12 @@ $as_echo "$as_me: WARNING: trying to bootstrap a cross compiler" >&2;} ;; esac +# When bootstrapping with GCC, build stage 1 in C++98 mode to ensure that a +# C++98 compiler can still start the bootstrap. +if test "$enable_bootstrap:$GXX" = "yes:yes"; then + CXX="$CXX -std=c++98" +fi + # Used for setting $lt_cv_objdir { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 $as_echo_n "checking for objdir... " >&6; } diff --git a/configure.ac b/configure.ac index 4da04b76fdf8..431cb170e163 100644 --- a/configure.ac +++ b/configure.ac @@ -1442,6 +1442,12 @@ case "$have_compiler:$host:$target:$enable_bootstrap" in ;; esac +# When bootstrapping with GCC, build stage 1 in C++98 mode to ensure that a +# C++98 compiler can still start the bootstrap. +if test "$enable_bootstrap:$GXX" = "yes:yes"; then + CXX="$CXX -std=c++98" +fi + # Used for setting $lt_cv_objdir _LT_CHECK_OBJDIR -- 2.39.2