From a9d49e9681cb68b6ead50c0c526d2b3d84bd3dd9 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 25 Jul 2018 12:01:39 +0100 Subject: [PATCH] Add new src/c++17 directory to list in acinclude.m4 * acinclude.m4 (glibcxx_SUBDIRS): Add src/c++17. * src/Makefile.am: Add comment. * src/c++17/Makefile.in: Regenerate. From-SVN: r262964 --- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/acinclude.m4 | 2 +- libstdc++-v3/src/Makefile.am | 1 + libstdc++-v3/src/c++17/Makefile.in | 3 +-- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 76903e3e9ab..2ac56cc748e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2018-07-25 Jonathan Wakely + * acinclude.m4 (glibcxx_SUBDIRS): Add src/c++17. + * src/Makefile.am: Add comment. + * src/c++17/Makefile.in: Regenerate. + * include/Makefile.am: Add new header. * include/Makefile.in: Regenerate. * include/bits/std_mutex.h [!_GLIBCXX_USE_C99_STDINT_TR1] (mutex) diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index bbf3c8df3e1..6d68e907426 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -49,7 +49,7 @@ AC_DEFUN([GLIBCXX_CONFIGURE], [ # Keep these sync'd with the list in Makefile.am. The first provides an # expandable list at autoconf time; the second provides an expandable list # (i.e., shell variable) at configure time. - m4_define([glibcxx_SUBDIRS],[include libsupc++ src src/c++98 src/c++11 src/filesystem doc po testsuite python]) + m4_define([glibcxx_SUBDIRS],[include libsupc++ src src/c++98 src/c++11 src/c++17 src/filesystem doc po testsuite python]) SUBDIRS='glibcxx_SUBDIRS' # These need to be absolute paths, yet at the same time need to diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 09edcdbc471..9a2fe297ddb 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -28,6 +28,7 @@ else filesystem_dir = endif +## Keep this list sync'd with acinclude.m4:GLIBCXX_CONFIGURE. SUBDIRS = c++98 c++11 c++17 $(filesystem_dir) # Cross compiler support. diff --git a/libstdc++-v3/src/c++17/Makefile.in b/libstdc++-v3/src/c++17/Makefile.in index 40b186e0a77..158dca99c19 100644 --- a/libstdc++-v3/src/c++17/Makefile.in +++ b/libstdc++-v3/src/c++17/Makefile.in @@ -218,7 +218,6 @@ VTV_CXXFLAGS = @VTV_CXXFLAGS@ VTV_CXXLINKFLAGS = @VTV_CXXLINKFLAGS@ VTV_PCH_CXXFLAGS = @VTV_PCH_CXXFLAGS@ WARN_FLAGS = @WARN_FLAGS@ -WERROR = @WERROR@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@ XSL_STYLE_DIR = @XSL_STYLE_DIR@ @@ -314,7 +313,7 @@ STAMP = echo timestamp > toolexecdir = $(glibcxx_toolexecdir) toolexeclibdir = $(glibcxx_toolexeclibdir) @ENABLE_WERROR_FALSE@WERROR_FLAG = -@ENABLE_WERROR_TRUE@WERROR_FLAG = $(WERROR) +@ENABLE_WERROR_TRUE@WERROR_FLAG = -Werror @ENABLE_EXTERN_TEMPLATE_FALSE@XTEMPLATE_FLAGS = @ENABLE_EXTERN_TEMPLATE_TRUE@XTEMPLATE_FLAGS = -fno-implicit-templates -- 2.30.2