diff options
| author | Kostya Serebryany <kcc@google.com> | 2013-05-23 12:51:49 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@google.com> | 2013-05-23 12:51:49 +0000 |
| commit | dc9552e846578e1573221197861ea7c31650b927 (patch) | |
| tree | eac33a1ba33df2f19c1467ae975350d2b1e43b77 | |
| parent | d3b74abdf4d7e065937bfa5ef75e18696d94ec65 (diff) | |
r194664 in google/gcc-4_7 lost one line in
libstdc++-v3/libsupc++/Makefile.am and did not regenerate Makefile.in
(it seems to have been edited manually).
Now re-running automake in libstdc++ results in a non-trivial diff.
With this patch the difference
in generated files becomes trivial (line breaks only).
(Patch by Evgeniy Stepanov)
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/google/gcc-4_7@199248 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/libsupc++/Makefile.am | 3 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/Makefile.in | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am index 34abc2cb8af..786f8ecee81 100644 --- a/libstdc++-v3/libsupc++/Makefile.am +++ b/libstdc++-v3/libsupc++/Makefile.am @@ -137,7 +137,8 @@ nested_exception.o: nested_exception.cc AM_CXXFLAGS = \ $(glibcxx_lt_pic_flag) $(glibcxx_compiler_shared_flag) \ $(XTEMPLATE_FLAGS) \ - $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) + $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) \ + $($(@)_no_omit_frame_pointer) AM_MAKEFLAGS = \ "gxx_include_dir=$(gxx_include_dir)" diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index a4f93aad9c5..e032a94b331 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -418,9 +418,7 @@ libsupc__convenience_la_SOURCES = $(sources) $(c_sources) AM_CXXFLAGS = \ $(glibcxx_lt_pic_flag) $(glibcxx_compiler_shared_flag) \ $(XTEMPLATE_FLAGS) \ - $(WARN_CXXFLAGS) \ - $(OPTIMIZE_CXXFLAGS) \ - $(CONFIG_CXXFLAGS) \ + $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) \ $($(@)_no_omit_frame_pointer) AM_MAKEFLAGS = \ |