# HG changeset patch # User Christian Brabandt # Date 1537531206 -7200 # Node ID 6cfd3d47f1ca9c8fcaccf1e2b5f46460a59b47de # Parent 4d2ab393f59ab6e9cd8d458523140125e790eb39 patch 8.1.0419: Cygwin: running cproto fails with -O2 commit https://github.com/vim/vim/commit/de2bd37becbec3547ffbaa86321c7ea6379d6bf0 Author: Bram Moolenaar 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) diff --git a/src/Makefile b/src/Makefile --- 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 --- 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,