From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 21 Sep 2018 11:56:25 +0000 (+0200)
Subject: patch 8.1.0419: Cygwin: running cproto fails with -O2
X-Git-Tag: v8.1.0419
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de2bd37becbec3547ffbaa86321c7ea6379d6bf0;p=vim

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 #3465)
---

diff --git a/src/Makefile b/src/Makefile
index 9c19281d8..5b25e033f 100644
--- 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.
diff --git a/src/version.c b/src/version.c
index 079657eff..bc3cbf3f8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -794,6 +794,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    419,
 /**/
     418,
 /**/