Skip to content

Commit

Permalink
updated for version 7.3.722
Browse files Browse the repository at this point in the history
Problem:    Perl flags may contain "-g", which breaks "make proto".
Solution:   Filter out the "-g" flag for cproto. (Ken Takata)
  • Loading branch information
brammool committed Nov 20, 2012
1 parent c0d4759 commit d59762d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/Makefile
Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -725,6 +725,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
722,
/**/
721,
/**/
Expand Down

0 comments on commit d59762d

Please sign in to comment.