From 74b7ec8c45c8db5df69e7a9894e6306e1d631a58 Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Fri, 24 Jul 2015 07:05:19 +0000 Subject: [PATCH] libstdc++-v3/fragment.am (AM_CPPFLAGS): Add CPPFLAGS 2015-07-24 Michael Haubenwallner * fragment.am (AM_CPPFLAGS): Add CPPFLAGS. * Makefile.in: Regenerate. * doc/Makefile.in: Regenerate. * include/Makefile.in: Regenerate. * libsupc++/Makefile.in: Regenerate. * po/Makefile.in: Regenerate. * python/Makefile.in: Regenerate. * src/Makefile.in: Regenerate. * src/c++11/Makefile.in: Regenerate. * src/c++98/Makefile.in: Regenerate. * src/filesystem/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. From-SVN: r226138 --- libstdc++-v3/ChangeLog | 15 +++++++++++++++ libstdc++-v3/Makefile.in | 2 +- libstdc++-v3/doc/Makefile.in | 2 +- libstdc++-v3/fragment.am | 2 +- libstdc++-v3/include/Makefile.in | 2 +- libstdc++-v3/libsupc++/Makefile.in | 2 +- libstdc++-v3/po/Makefile.in | 2 +- libstdc++-v3/python/Makefile.in | 2 +- libstdc++-v3/src/Makefile.in | 2 +- libstdc++-v3/src/c++11/Makefile.in | 2 +- libstdc++-v3/src/c++98/Makefile.in | 2 +- libstdc++-v3/src/filesystem/Makefile.in | 2 +- libstdc++-v3/testsuite/Makefile.in | 2 +- 13 files changed, 27 insertions(+), 12 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 152887b178f..0d3eb25389e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,18 @@ +2015-07-24 Michael Haubenwallner + + * fragment.am (AM_CPPFLAGS): Add CPPFLAGS. + * Makefile.in: Regenerate. + * doc/Makefile.in: Regenerate. + * include/Makefile.in: Regenerate. + * libsupc++/Makefile.in: Regenerate. + * po/Makefile.in: Regenerate. + * python/Makefile.in: Regenerate. + * src/Makefile.in: Regenerate. + * src/c++11/Makefile.in: Regenerate. + * src/c++98/Makefile.in: Regenerate. + * src/filesystem/Makefile.in: Regenerate. + * testsuite/Makefile.in: Regenerate. + 2015-07-23 DJ Delorie * include/bits/functional_hash.h: Add specializations for __intN diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index 427dcdf640a..3159b714a1a 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -338,7 +338,7 @@ WARN_CXXFLAGS = \ # -I/-D flags to pass when compiling. -AM_CPPFLAGS = $(GLIBCXX_INCLUDES) +AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS) @GLIBCXX_HOSTED_TRUE@hosted_source = src doc po testsuite python SUBDIRS = include libsupc++ $(hosted_source) ACLOCAL_AMFLAGS = -I . -I .. -I ../config diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in index 798a9a3ae37..3e729c130e7 100644 --- a/libstdc++-v3/doc/Makefile.in +++ b/libstdc++-v3/doc/Makefile.in @@ -320,7 +320,7 @@ WARN_CXXFLAGS = \ # -I/-D flags to pass when compiling. -AM_CPPFLAGS = $(GLIBCXX_INCLUDES) +AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS) @BUILD_XML_FALSE@STAMP_XML = # Documentation Overview diff --git a/libstdc++-v3/fragment.am b/libstdc++-v3/fragment.am index 0036ae8004a..03eb753536d 100644 --- a/libstdc++-v3/fragment.am +++ b/libstdc++-v3/fragment.am @@ -34,5 +34,5 @@ WARN_CXXFLAGS = \ $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once # -I/-D flags to pass when compiling. -AM_CPPFLAGS = $(GLIBCXX_INCLUDES) +AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS) diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 24246a65541..9539f5fe062 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -310,7 +310,7 @@ WARN_CXXFLAGS = \ # -I/-D flags to pass when compiling. -AM_CPPFLAGS = $(GLIBCXX_INCLUDES) +AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS) # Standard C++ includes. std_srcdir = ${glibcxx_srcdir}/include/std diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 8f627c6bcd3..f3648ac475c 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -381,7 +381,7 @@ WARN_CXXFLAGS = \ # -I/-D flags to pass when compiling. -AM_CPPFLAGS = $(GLIBCXX_INCLUDES) +AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS) # Need this library to both be part of libstdc++.a, and installed # separately too. diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in index 5bcf4da7fa5..13993c85819 100644 --- a/libstdc++-v3/po/Makefile.in +++ b/libstdc++-v3/po/Makefile.in @@ -310,7 +310,7 @@ WARN_CXXFLAGS = \ # -I/-D flags to pass when compiling. -AM_CPPFLAGS = $(GLIBCXX_INCLUDES) +AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS) # Location of installation directories. locale_installdir = $(DESTDIR)$(datadir)/locale diff --git a/libstdc++-v3/python/Makefile.in b/libstdc++-v3/python/Makefile.in index c5e4cb0a87c..1fe2ecb5bbf 100644 --- a/libstdc++-v3/python/Makefile.in +++ b/libstdc++-v3/python/Makefile.in @@ -340,7 +340,7 @@ WARN_CXXFLAGS = \ # -I/-D flags to pass when compiling. -AM_CPPFLAGS = $(GLIBCXX_INCLUDES) +AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS) @ENABLE_PYTHONDIR_FALSE@pythondir = $(datadir)/gcc-$(gcc_version)/python @ENABLE_PYTHONDIR_TRUE@pythondir = $(prefix)/$(python_mod_dir) nobase_python_DATA = \ diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 113d7348709..0776dccc212 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -373,7 +373,7 @@ WARN_CXXFLAGS = \ # -I/-D flags to pass when compiling. -AM_CPPFLAGS = $(GLIBCXX_INCLUDES) +AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS) @ENABLE_FILESYSTEM_TS_FALSE@filesystem_dir = @ENABLE_FILESYSTEM_TS_TRUE@filesystem_dir = filesystem SUBDIRS = c++98 c++11 $(filesystem_dir) diff --git a/libstdc++-v3/src/c++11/Makefile.in b/libstdc++-v3/src/c++11/Makefile.in index 4f92d71d19c..5a24cb0a6cb 100644 --- a/libstdc++-v3/src/c++11/Makefile.in +++ b/libstdc++-v3/src/c++11/Makefile.in @@ -343,7 +343,7 @@ WARN_CXXFLAGS = \ # -I/-D flags to pass when compiling. -AM_CPPFLAGS = $(GLIBCXX_INCLUDES) +AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS) # Convenience library for C++11 runtime. noinst_LTLIBRARIES = libc++11convenience.la diff --git a/libstdc++-v3/src/c++98/Makefile.in b/libstdc++-v3/src/c++98/Makefile.in index 137214f1933..b1a1b496242 100644 --- a/libstdc++-v3/src/c++98/Makefile.in +++ b/libstdc++-v3/src/c++98/Makefile.in @@ -344,7 +344,7 @@ WARN_CXXFLAGS = \ # -I/-D flags to pass when compiling. -AM_CPPFLAGS = $(GLIBCXX_INCLUDES) +AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS) # Convenience library for C++98 runtime. noinst_LTLIBRARIES = libc++98convenience.la diff --git a/libstdc++-v3/src/filesystem/Makefile.in b/libstdc++-v3/src/filesystem/Makefile.in index 97c0832847c..a315bb63998 100644 --- a/libstdc++-v3/src/filesystem/Makefile.in +++ b/libstdc++-v3/src/filesystem/Makefile.in @@ -350,7 +350,7 @@ WARN_CXXFLAGS = \ # -I/-D flags to pass when compiling. -AM_CPPFLAGS = $(GLIBCXX_INCLUDES) +AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS) toolexeclib_LTLIBRARIES = libstdc++fs.la headers = sources = \ diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index e0e7114147d..31fa94c42cb 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -313,7 +313,7 @@ WARN_CXXFLAGS = \ # -I/-D flags to pass when compiling. -AM_CPPFLAGS = $(GLIBCXX_INCLUDES) +AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS) # Generated lists of files to run. All of these names are valid make # targets, if you wish to generate a list manually. -- 2.30.2