summaryrefslogtreecommitdiff
path: root/libstdc++-v3/Makefile.in
diff options
context:
space:
mode:
authorBenjamin Kosnik <bkoz@redhat.com>2012-02-17 20:26:32 +0000
committerBenjamin Kosnik <bkoz@gcc.gnu.org>2012-02-17 20:26:32 +0000
commitb124c5c482ecd0bfa00b99fc4964a88b0c0b8558 (patch)
tree9b181e25f4c9662252530db362b30ffcf42f7b28 /libstdc++-v3/Makefile.in
parent5a815b930afa24b49723919b0e7da0bd04028d28 (diff)
re PR libstdc++/47058 ("--enable-maintainer-mode --disable-werror" wrongly upgrades warnings to errors in libstdc++)
2012-02-17 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/47058 * acinclude.m4 (GLIBCXX_ENABLE_WERROR): New. (GLIBCXX_EXPORT_FLAGS): Add -Wabi to WARN_FLAGS * configure.ac: Use it. * fragment.am: Set WERROR_FLAG conditionally on --disable-werror. * configure: Regenerate. * python/Makefile.in: Same. * Makefile.in: Same. * doc/Makefile.in: Same. * include/Makefile.in: Same. * po/Makefile.in: Same. * python/Makefile.in: Same. * src/Makefile.in: Same. * src/c++11/Makefile.in: Same. * src/c++98/Makefile.in: Same. * testsuite/Makefile.in: Same. From-SVN: r184349
Diffstat (limited to 'libstdc++-v3/Makefile.in')
-rw-r--r--libstdc++-v3/Makefile.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in
index 74fade4ca47..6a66c60a651 100644
--- a/libstdc++-v3/Makefile.in
+++ b/libstdc++-v3/Makefile.in
@@ -288,6 +288,8 @@ PWD_COMMAND = $${PWDCMD-pwd}
STAMP = echo timestamp >
toolexecdir = $(glibcxx_toolexecdir)
toolexeclibdir = $(glibcxx_toolexeclibdir)
+@ENABLE_WERROR_FALSE@WERROR_FLAG =
+@ENABLE_WERROR_TRUE@WERROR_FLAG = $(WERROR)
# These bits are all figured out from configure. Look in acinclude.m4
# or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS.
@@ -295,7 +297,7 @@ CONFIG_CXXFLAGS = \
$(SECTION_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@
WARN_CXXFLAGS = \
- $(WARN_FLAGS) $(WERROR) -fdiagnostics-show-location=once -Wabi
+ $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once
# -I/-D flags to pass when compiling.