diff options
| author | Joern Rennecke <amylaar@spamcop.net> | 2010-11-25 08:02:13 +0000 |
|---|---|---|
| committer | Joern Rennecke <amylaar@gcc.gnu.org> | 2010-11-25 08:02:13 +0000 |
| commit | 459d4972e8e152ff080e74d4a811f69fc20a413f (patch) | |
| tree | 5f5701d4639286323c47faaa1ffbee794bea1be7 /gcc/Makefile.in | |
| parent | 604e3ff316fdb7298f3a54912fb6adc2268765f8 (diff) | |
| download | gcc-459d4972e8e152ff080e74d4a811f69fc20a413f.tar.gz | |
re PR bootstrap/45888 (tm.texi generation is not portable, rule is broken)
2010-11-25 Joern Rennecke <amylaar@spamcop.net>
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
PR bootstrap/45888
* Makefile.in (s-tm-texi): Remove \r occurences from tmp-tm.texi.
Fix target.def pathname in timestamp comparison.
Co-Authored-By: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
From-SVN: r167137
Diffstat (limited to 'gcc/Makefile.in')
| -rw-r--r-- | gcc/Makefile.in | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 3a86343f55c..3165f101fff 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -3722,14 +3722,23 @@ s-target-hooks-def-h: build/genhooks$(build_exeext) # We use a different pathname here to avoid a circular dependency. s-tm-texi: $(srcdir)/doc/../doc/tm.texi +# The tm.texi we want to compare against / check into svn should have +# unix-style line endings. To make this work on MinGW, remove \r. +# \r is not portable to Solaris tr, therefore we have a special +# case for ASCII. We use \r for other encodings like EBCDIC. s-tm-texi: build/genhooks$(build_exeext) $(srcdir)/doc/tm.texi.in $(RUN_GEN) build/genhooks$(build_exeext) \ $(srcdir)/doc/tm.texi.in > tmp-tm.texi + case `echo X|tr X '\101'` in \ + A) tr -d '\015' < tmp-tm.texi > tmp2-tm.texi ;; \ + *) tr -d '\r' < tmp-tm.texi > tmp2-tm.texi ;; \ + esac + mv tmp2-tm.texi tmp-tm.texi $(SHELL) $(srcdir)/../move-if-change tmp-tm.texi tm.texi @if cmp -s $(srcdir)/doc/tm.texi tm.texi; then \ $(STAMP) $@; \ elif test $(srcdir)/doc/tm.texi -nt $(srcdir)/doc/tm.texi.in \ - && test $(srcdir)/doc/tm.texi -nt $(srcdir)/doc/target.def; then \ + && test $(srcdir)/doc/tm.texi -nt $(srcdir)/target.def; then \ echo >&2 ; \ echo You should edit $(srcdir)/doc/tm.texi.in rather than $(srcdir)/doc/tm.texi . >&2 ; \ false; \ |