thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.722

Browse Source 
Problem:    Perl flags may contain "-g", which breaks "make proto".
Solution:   Filter out the "-g" flag for cproto. (Ken Takata)
This commit is contained in:
Bram Moolenaar
2012-11-20 17:03:27 +01:00
parent c0d4759373
commit d59762dcb6
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile
View File

@@ -1753,10 +1753,11 @@ proto: $(PRO_AUTO) $(PRO_MANUAL)
# Filter out arguments that cproto doesn't support. # 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 "-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 "-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 # The -E"gcc -E" argument must be separate to avoid problems with shell
# quoting. # quoting.
CPROTO = cproto $(PROTO_FLAGS) -DPROTO \ 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. ### Would be nice if this would work for "normal" make.
### Currently it only works for (Free)BSD make. ### Currently it only works for (Free)BSD make.

2
src/version.c
View File

@@ -725,6 +725,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
722,
/**/ /**/
721, 721,
/**/ /**/