diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-01-27 22:34:53 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-01-27 22:34:53 +0000 |
| commit | 79cb6e627277c4fda6d1d7d7d50cada3f96c2765 (patch) | |
| tree | 149a42f0bddeff40c4a94a4b7a752b94f2c612dd /libgo/mksysinfo.sh | |
| parent | c307f1064fa0315692c3dcdd800435d5895b234d (diff) | |
| download | gcc-79cb6e627277c4fda6d1d7d7d50cada3f96c2765.tar.gz | |
libgo: Fix merge errors shown on Solaris.
From Rainer Orth.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@183651 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/mksysinfo.sh')
| -rwxr-xr-x | libgo/mksysinfo.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh index a10e42391e9..a3864fc0cd3 100755 --- a/libgo/mksysinfo.sh +++ b/libgo/mksysinfo.sh @@ -192,7 +192,7 @@ grep '^const _SHUT_' gen-sysinfo.go | sed -e 's/^\(const \)_\(SHUT[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT} # The net package requires some const definitions. -for m in IPV6_V6ONLY IPPROTO_IPV6 IPV6_JOIN_GROUP IPV6_LEAVE_GROUP IPV6_TCLASS; do +for m in IP_PKTINFO IPV6_V6ONLY IPPROTO_IPV6 IPV6_JOIN_GROUP IPV6_LEAVE_GROUP IPV6_TCLASS; do if ! grep "^const $m " ${OUT} >/dev/null 2>&1; then echo "const $m = 0" >> ${OUT} fi |