From d59762dcb6f3dd15fd1e91745561c4558a7b75a6 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 20 Nov 2012 17:03:27 +0100 Subject: [PATCH] updated for version 7.3.722 Problem: Perl flags may contain "-g", which breaks "make proto". Solution: Filter out the "-g" flag for cproto. (Ken Takata) --- src/Makefile | 3 ++- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index 36a26acd1a848..cb531a2047dd7 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 fdac7f14c9b31..7c65bd4178b7d 100644 --- a/src/version.c +++ b/src/version.c @@ -725,6 +725,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 722, /**/ 721, /**/