changeset 14814:6cfd3d47f1ca v8.1.0419

patch 8.1.0419: Cygwin: running cproto fails with -O2 commit https://github.com/vim/vim/commit/de2bd37becbec3547ffbaa86321c7ea6379d6bf0 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Sep 21 13:56:25 2018 +0200 patch 8.1.0419: Cygwin: running cproto fails with -O2 Problem: Cygwin: running cproto fails with -O2. Solution: Strip -O2 for cproto. (Ken Takata, closes https://github.com/vim/vim/issues/3465)
author Christian Brabandt <cb@256bit.org>
date Fri, 21 Sep 2018 14:00:06 +0200
parents 4d2ab393f59a
children 5c1d9630bec3
files src/Makefile src/version.c
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/Makefile
+++ b/src/Makefile
@@ -2028,8 +2028,9 @@ proto: $(PRO_AUTO) $(PRO_MANUAL)
 # them as a list of individual flags.
 # The -E"gcc -E" argument must be separate to avoid problems with shell
 # quoting.
+# Strip -O2, it may cause cproto to write stderr to the file "2".
 CPROTO = cproto $(PROTO_FLAGS) -DPROTO \
-	 `echo '$(LINT_CFLAGS)' | sed -e 's/ -[a-z-]\+//g'`
+	 `echo '$(LINT_CFLAGS)' | sed -e 's/ -[a-z-]\+//g' -e 's/ -O[^ ]\+//g'`
 
 ### Would be nice if this would work for "normal" make.
 ### Currently it only works for (Free)BSD make.
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    419,
+/**/
     418,
 /**/
     417,