From d266c7e94361a00ac5258e0a11e3d508efbf996a Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 29 Jul 2015 21:42:30 +0000 Subject: [PATCH] syscall: Fix to libgo/mksysinfo.sh In a recent change to mksysinfo.sh, a space was missing on some lines which caused the libgo build to hang on some systems. This corrects that problem. Fixes golang/go#11924 Reviewed-on: https://go-review.googlesource.com/12835 From-SVN: r226366 --- gcc/go/gofrontend/MERGE | 2 +- libgo/mksysinfo.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 663ad80..0915152 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -3aa95d96181dc4525b1b8ec189f9104afa6d7609 +9931f2c150e2da4b7d468db332823d8ef4fb8c34 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh index 029098f..942e8319 100755 --- a/libgo/mksysinfo.sh +++ b/libgo/mksysinfo.sh @@ -1026,19 +1026,19 @@ if ! grep '^const TUNDETACHFILTER' ${OUT} >/dev/null 2>&1; then fi fi -if ! grep '^const TUNGETVNETHDRSZ'${OUT} >/dev/null 2>&1; then +if ! grep '^const TUNGETVNETHDRSZ' ${OUT} >/dev/null 2>&1; then if grep '^const _TUNGETVNETHDRSZ_val' ${OUT} >/dev/null 2>&1; then echo 'const TUNGETVNETHDRSZ = _TUNGETVNETHDRSZ_val' >> ${OUT} fi fi -if ! grep '^const TUNSETVNETHDRSZ'${OUT} >/dev/null 2>&1; then +if ! grep '^const TUNSETVNETHDRSZ' ${OUT} >/dev/null 2>&1; then if grep '^const _TUNSETVNETHDRSZ_val' ${OUT} >/dev/null 2>&1; then echo 'const TUNSETVNETHDRSZ = _TUNSETVNETHDRSZ_val' >> ${OUT} fi fi -if ! grep '^const TUNSETQUEUE'${OUT} >/dev/null 2>&1; then +if ! grep '^const TUNSETQUEUE' ${OUT} >/dev/null 2>&1; then if grep '^const _TUNSETQUEUE_val' ${OUT} >/dev/null 2>&1; then echo 'const TUNSETQUEUE = _TUNSETQUEUE_val' >> ${OUT} fi -- 2.7.4