From 697044e099a885ab311d95acf7d543ac71e442e8 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Tue, 28 Jan 2003 01:17:36 +0000 Subject: [PATCH] Makefile.am (CONFIG_CXXFLAGS): Reverse order of @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@. * src/Makefile.am (CONFIG_CXXFLAGS): Reverse order of @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@. * libsupc++/Makefile.am (CONFIG_CXXFLAGS): Likewise. * src/Makefile.in: Regenerate. * libsupc++/Makefile.in: Regenerate. From-SVN: r61915 --- libstdc++-v3/ChangeLog | 8 ++++++++ libstdc++-v3/libsupc++/Makefile.am | 2 +- libstdc++-v3/libsupc++/Makefile.in | 2 +- libstdc++-v3/src/Makefile.am | 2 +- libstdc++-v3/src/Makefile.in | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 13d68142098..1241b209ab7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2003-01-28 Danny Smith + + * src/Makefile.am (CONFIG_CXXFLAGS): Reverse order of + @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@. + * libsupc++/Makefile.am (CONFIG_CXXFLAGS): Likewise. + * src/Makefile.in: Regenerate. + * libsupc++/Makefile.in: Regenerate. + 2003-01-27 Alexandre Oliva * acinclude.m4 (glibcpp_toolexeclibdir): Instead of diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am index 7fd2f58e396..32b1344c640 100644 --- a/libstdc++-v3/libsupc++/Makefile.am +++ b/libstdc++-v3/libsupc++/Makefile.am @@ -49,7 +49,7 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@ # or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS # NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden. CONFIG_CXXFLAGS = \ - @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ + @SECTION_FLAGS@ @EXTRA_CXX_FLAGS@ # Warning flags to use. WARN_CXXFLAGS = \ diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index f292e54323e..9c61a2a4ffb 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -165,7 +165,7 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@ # or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS # NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden. CONFIG_CXXFLAGS = \ - @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ + @SECTION_FLAGS@ @EXTRA_CXX_FLAGS@ # Warning flags to use. diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index ee2affc3f45..76c3638ce81 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -52,7 +52,7 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@ # These bits are all figured out from configure. Look in acinclude.m4 # or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS CONFIG_CXXFLAGS = \ - @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ + @SECTION_FLAGS@ @EXTRA_CXX_FLAGS@ # Warning flags to use. WARN_CXXFLAGS = \ diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index a94408fbb1c..b60a50c00d4 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -156,7 +156,7 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@ # These bits are all figured out from configure. Look in acinclude.m4 # or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS CONFIG_CXXFLAGS = \ - @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ + @SECTION_FLAGS@ @EXTRA_CXX_FLAGS@ # Warning flags to use.