diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | Makefile.tpl | 1 | ||||
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | configure.ac | 7 |
5 files changed, 0 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog index 7b2f2b29ff4..d742bf253d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,3 @@ -2015-05-21 Jason Merrill <jason@redhat.com> - - * configure.ac: Add -std=c++98 to stage1_cxxflags. - * Makefile.tpl (STAGE1_CXXFLAGS): And substitute it. - * Makefile.in, configure: Regenerate. - 2015-05-16 James Bowman <james.bowman@ftdichip.com> * configure.ac: FT32 target added. diff --git a/Makefile.in b/Makefile.in index 7ae2a40d4e3..24f51a413c1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -487,7 +487,6 @@ STAGEfeedback_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS) # only ones useful for building stage2. STAGE1_CFLAGS = @stage1_cflags@ -STAGE1_CXXFLAGS = @stage1_cxxflags@ STAGE1_CHECKING = @stage1_checking@ STAGE1_LANGUAGES = @stage1_languages@ # * We force-disable intermodule optimizations, even if diff --git a/Makefile.tpl b/Makefile.tpl index 914196f0914..660e1e44bb9 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -440,7 +440,6 @@ STAGE[+id+]_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS) # only ones useful for building stage2. STAGE1_CFLAGS = @stage1_cflags@ -STAGE1_CXXFLAGS = @stage1_cxxflags@ STAGE1_CHECKING = @stage1_checking@ STAGE1_LANGUAGES = @stage1_languages@ # * We force-disable intermodule optimizations, even if diff --git a/configure b/configure index 07aba3e460d..d8043298ad0 100755 --- a/configure +++ b/configure @@ -559,7 +559,6 @@ compare_exclusions host_shared stage2_werror_flag stage1_checking -stage1_cxxflags stage1_cflags MAINT MAINTAINER_MODE_FALSE @@ -14756,13 +14755,6 @@ case $build in *) stage1_cflags="-g -J" ;; esac ;; esac -stage1_cxxflags='$(STAGE1_CFLAGS)' -if test "$GCC" = yes; then - # Build stage 1 in C++98 mode to ensure that a C++98 compiler can still - # start the bootstrap. - stage1_cxxflags="$stage1_cxxflags -std=c++98" -fi - diff --git a/configure.ac b/configure.ac index 5808eda41aa..4da04b76fdf 100644 --- a/configure.ac +++ b/configure.ac @@ -3476,15 +3476,8 @@ case $build in *) stage1_cflags="-g -J" ;; esac ;; esac -stage1_cxxflags='$(STAGE1_CFLAGS)' -if test "$GCC" = yes; then - # Build stage 1 in C++98 mode to ensure that a C++98 compiler can still - # start the bootstrap. - stage1_cxxflags="$stage1_cxxflags -std=c++98" -fi AC_SUBST(stage1_cflags) -AC_SUBST(stage1_cxxflags) # Enable --enable-checking in stage1 of the compiler. AC_ARG_ENABLE(stage1-checking, |