aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Prichard <rprichard@google.com>2018-02-26 21:33:27 -0800
committerRyan Prichard <rprichard@google.com>2018-02-26 22:10:55 -0800
commite46354e85363dbd7ea85492f70af89273881709f (patch)
tree6c7705ea00899bb97598a389871a9ef8eb90e90f
parent2cdcfd30c27f0d836cc477f2ae9f456287fd6b1b (diff)
downloadtoolchain_gcc-e46354e85363dbd7ea85492f70af89273881709f.tar.gz
toolchain_gcc-e46354e85363dbd7ea85492f70af89273881709f.tar.bz2
toolchain_gcc-e46354e85363dbd7ea85492f70af89273881709f.zip
Fix gcc 4.8.3 makeinfo build failure
/usr/local/google/home/rprichard/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/doc/gcc.texi:88: warning: @tex should only appear at the beginning of a line /usr/local/google/home/rprichard/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/doc/gcc.texi:208: no matching `@end tex' /usr/local/google/home/rprichard/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/doc/gcc.texi:208: no matching `@end multitable' /usr/local/google/home/rprichard/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/doc/gcc.texi:208: no matching `@end titlepage' Makefile:4353: recipe for target 'doc/gcc.info' failed Even though it says "warning", the command exits unsuccessfully and fails the build. Adopt part of a patch from: https://gcc.gnu.org/ml/gcc-patches/2013-09/msg02100.html This change is already in our gcc-4.9 directory. For reference, here's the makeinfo version on my machine: $ makeinfo --version texi2any (GNU texinfo) 6.4.90 Test: ./toolchain/mingw/build.sh (in AOSP mingw branch) Change-Id: Ib740c39d127ac8a127c929465fdf89477698a5e4
-rw-r--r--gcc-4.8.3/gcc/doc/gcc.texi4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc-4.8.3/gcc/doc/gcc.texi b/gcc-4.8.3/gcc/doc/gcc.texi
index 02b81cf86..84123f6b1 100644
--- a/gcc-4.8.3/gcc/doc/gcc.texi
+++ b/gcc-4.8.3/gcc/doc/gcc.texi
@@ -85,9 +85,9 @@ Published by:
@item GNU Press
@tab Website: www.gnupress.org
@item a division of the
-@tab General: @tex press@@gnu.org @end tex
+@tab General: @email{press@@gnu.org}
@item Free Software Foundation
-@tab Orders: @tex sales@@gnu.org @end tex
+@tab Orders: @email{sales@@gnu.org}
@item 51 Franklin Street, Fifth Floor
@tab Tel 617-542-5942
@item Boston, MA 02110-1301 USA