Patchwork [google/gcc-4_7-mobile] Fix inconsistency between Makefile.am and Makefile.in under libstdc++-v3

login
register
mail settings
Submitter Han Shen
Date March 15, 2013, 9:33 p.m.
Message ID <CACkGtrgFUsD5+aJJKN5kh3XtC=NNqJL5H1FAf=SGdZavwiMvyQ@mail.gmail.com>
Download mbox | patch
Permalink /patch/228187/
State New
Headers show

Comments

Han Shen - March 15, 2013, 9:33 p.m.
Fix inconsistency between Makefile.am and Makefile.in under libstdc++.

The inconsistency was introduced by
svn+ssh://gcc.gnu.org/svn/gcc/branches/google/gcc-4_7@194664

Since the re-generated Makefile.in has not changed (thus not included
in the patch), this modification should have no impact.

Hi Caroline, ok for google/gcc-4_7-mobile branch?

Patch >>>

--
Han Shen

Patch

diff --git a/libstdc++-v3/libsupc++/Makefile.am
b/libstdc++-v3/libsupc++/Makefile.am
index 34abc2c..0c4339d 100644
--- a/libstdc++-v3/libsupc++/Makefile.am
+++ b/libstdc++-v3/libsupc++/Makefile.am
@@ -137,7 +137,10 @@  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)"