diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-11-20 17:03:27 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-11-20 17:03:27 +0100 |
| commit | d59762dcb6f3dd15fd1e91745561c4558a7b75a6 (patch) | |
| tree | 050197129b9c52d672bb079c2c40037cc5a81446 | |
| parent | c0d475937372c98f9a67d25f2c0beb71e39b4fb1 (diff) | |
updated for version 7.3.722v7.3.722
Problem: Perl flags may contain "-g", which breaks "make proto".
Solution: Filter out the "-g" flag for cproto. (Ken Takata)
| -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 36a26acd1a..cb531a2047 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1753,10 +1753,11 @@ proto: $(PRO_AUTO) $(PRO_MANUAL) # Filter out arguments that cproto doesn't support. # Don't pass "-pthread" to cproto, it sees it as a list of individual flags. # Don't pass "-fstack-protector" to cproto, for the same reason. +# Don't pass "-g" to cproto. # The -E"gcc -E" argument must be separate to avoid problems with shell # quoting. CPROTO = cproto $(PROTO_FLAGS) -DPROTO \ - `echo '$(LINT_CFLAGS)' | sed -e 's/-pthread//g' -e 's/-fstack-protector//g'` + `echo '$(LINT_CFLAGS)' | sed -e 's/-pthread//g' -e 's/-fstack-protector//g' -e 's/\ -g\ / /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 fdac7f14c9..7c65bd4178 100644 --- a/src/version.c +++ b/src/version.c @@ -726,6 +726,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 722, +/**/ 721, /**/ 720, |