diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2012-02-28 10:28:18 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2012-02-28 10:28:18 +0100 |
| commit | 9396206b54f13ac683b681e2b117fa4704ada247 (patch) | |
| tree | f082775e99fb773e647c5ae76af63aa60561e67c | |
| parent | 85998a930587e8b03cf19bae41bb198cf82328b8 (diff) | |
| download | gcc-9396206b54f13ac683b681e2b117fa4704ada247.zip gcc-9396206b54f13ac683b681e2b117fa4704ada247.tar.gz gcc-9396206b54f13ac683b681e2b117fa4704ada247.tar.bz2 | |
Makefile.am (libstdc++-symbols.ver): Only remove comment lines if they are at the beginning of lines (with optional...
* src/Makefile.am (libstdc++-symbols.ver): Only remove comment lines
if they are at the beginning of lines (with optional whitespace before
#).
* src/Makefile.in: Regenerated.
From-SVN: r184621
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/src/Makefile.am | 2 | ||||
| -rw-r--r-- | libstdc++-v3/src/Makefile.in | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 08f82ba..9d038f2 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2012-02-28 Jakub Jelinek <jakub@redhat.com> + + * src/Makefile.am (libstdc++-symbols.ver): Only remove comment lines + if they are at the beginning of lines (with optional whitespace before + #). + * src/Makefile.in: Regenerated. + 2012-02-27 Jakub Jelinek <jakub@redhat.com> * config/abi/post/i386-linux-gnu/baseline_symbols.txt: Update. diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index f3ca0d7..eb80bfe 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -115,7 +115,7 @@ libstdc++-symbols.ver: ${glibcxx_srcdir}/$(SYMVER_FILE) \ rm tmp.top tmp.bottom; \ fi; \ fi - $(EGREP) -v '#(#| |$$)' $@.tmp | \ + $(EGREP) -v '^[ ]*#(#| |$$)' $@.tmp | \ $(COMPILE) -E -P -include config.h - > $@ || (rm -f $@ ; exit 1) rm -f $@.tmp diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 17a6fb2..34c0a31 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -776,7 +776,7 @@ vpath % $(top_srcdir) @ENABLE_SYMVERS_TRUE@ rm tmp.top tmp.bottom; \ @ENABLE_SYMVERS_TRUE@ fi; \ @ENABLE_SYMVERS_TRUE@ fi -@ENABLE_SYMVERS_TRUE@ $(EGREP) -v '#(#| |$$)' $@.tmp | \ +@ENABLE_SYMVERS_TRUE@ $(EGREP) -v '^[ ]*#(#| |$$)' $@.tmp | \ @ENABLE_SYMVERS_TRUE@ $(COMPILE) -E -P -include config.h - > $@ || (rm -f $@ ; exit 1) @ENABLE_SYMVERS_TRUE@ rm -f $@.tmp @ENABLE_SYMVERS_SUN_TRUE@@ENABLE_SYMVERS_TRUE@libstdc++-symbols.ver-sun : libstdc++-symbols.ver \ |