Skip to content

Commit 0a8a846

Browse files
committed
updated for version 7.4.510
Problem: "-fwrapv" argument breaks use of cproto. Solution: Remove the alphabetic arguments in a drastic way.
1 parent 228d61e commit 0a8a846

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1779,13 +1779,12 @@ update-po:
17791779
proto: $(PRO_AUTO) $(PRO_MANUAL)
17801780

17811781
# Filter out arguments that cproto doesn't support.
1782-
# Don't pass "-pthread" to cproto, it sees it as a list of individual flags.
1783-
# Don't pass "-fstack-protector" to cproto, for the same reason.
1784-
# Don't pass "-g" to cproto.
1782+
# Don't pass "-pthread", "-fwrapv" and similar arguments to cproto, it sees
1783+
# them as a list of individual flags.
17851784
# The -E"gcc -E" argument must be separate to avoid problems with shell
17861785
# quoting.
17871786
CPROTO = cproto $(PROTO_FLAGS) -DPROTO \
1788-
`echo '$(LINT_CFLAGS)' | sed -e 's/-pthread//g' -e 's/-fstack-protector//g' -e 's/\ -g\ / /g'`
1787+
`echo '$(LINT_CFLAGS)' | sed -e 's/ -[a-z-]\+//g'`
17891788

17901789
### Would be nice if this would work for "normal" make.
17911790
### Currently it only works for (Free)BSD make.

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ static char *(features[]) =
741741

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
510,
744746
/**/
745747
509,
746748
/**/

0 commit comments

Comments
 (0)