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 | 96659311e078c3e327f457d1e7df663ec1e0304a (patch) | |
| tree | fe495b10de715ec0a2535669bba4f985eedb5b9d | |
| parent | 7652a962d8ac4a3c098f65a424762f99d6d0e8f8 (diff) | |
| download | vim-96659311e078c3e327f457d1e7df663ec1e0304a.tar.gz | |
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 36a26acd..cb531a20 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 fdac7f14..7c65bd41 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, |