diff options
author | Benjamin Kosnik <bkoz@redhat.com> | 2012-02-17 20:26:32 +0000 |
---|---|---|
committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2012-02-17 20:26:32 +0000 |
commit | b124c5c482ecd0bfa00b99fc4964a88b0c0b8558 (patch) | |
tree | 9b181e25f4c9662252530db362b30ffcf42f7b28 /libstdc++-v3/fragment.am | |
parent | 5a815b930afa24b49723919b0e7da0bd04028d28 (diff) | |
download | gcc-b124c5c482ecd0bfa00b99fc4964a88b0c0b8558.zip gcc-b124c5c482ecd0bfa00b99fc4964a88b0c0b8558.tar.gz gcc-b124c5c482ecd0bfa00b99fc4964a88b0c0b8558.tar.bz2 |
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/fragment.am')
-rw-r--r-- | libstdc++-v3/fragment.am | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libstdc++-v3/fragment.am b/libstdc++-v3/fragment.am index 2bcbc1a..304d396 100644 --- a/libstdc++-v3/fragment.am +++ b/libstdc++-v3/fragment.am @@ -13,12 +13,18 @@ STAMP = echo timestamp > toolexecdir = $(glibcxx_toolexecdir) toolexeclibdir = $(glibcxx_toolexeclibdir) +if ENABLE_WERROR +WERROR_FLAG=$(WERROR) +else +WERROR_FLAG= +endif + # 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. 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. AM_CPPFLAGS = $(GLIBCXX_INCLUDES) |