diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-09-21 13:56:25 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-09-21 13:56:25 +0200 |
| commit | de2bd37becbec3547ffbaa86321c7ea6379d6bf0 (patch) | |
| tree | ab338a9f5524a227c57570617f0966c5e22e553d | |
| parent | b872e63fc6c1955d3a9c33745e29c57f354aa73b (diff) | |
| download | vim-git-de2bd37becbec3547ffbaa86321c7ea6379d6bf0.tar.gz | |
patch 8.1.0419: Cygwin: running cproto fails with -O2v8.1.0419
Problem: Cygwin: running cproto fails with -O2.
Solution: Strip -O2 for cproto. (Ken Takata, closes #3465)
| -rw-r--r-- | src/Makefile | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
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 @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 419, +/**/ 418, /**/ 417, |