aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2016-10-28 17:55:13 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2016-10-28 17:55:13 +0000
commiteae2ada50349a429549a99145c5810e58807f809 (patch)
treecf9a6354b6d9a08c7bb96545f1ed586af80631e6
parentfcfceb1afb7bf5cdebb2c52cf71b3d7dc21f11a8 (diff)
downloadgcc-eae2ada50349a429549a99145c5810e58807f809.zip
gcc-eae2ada50349a429549a99145c5810e58807f809.tar.gz
gcc-eae2ada50349a429549a99145c5810e58807f809.tar.bz2
libgo: redirect grep output in mkrsysinfo.sh to /dev/null
I noticed a stray useless output line when building libgo. Reviewed-on: https://go-review.googlesource.com/32294 From-SVN: r241655
-rw-r--r--gcc/go/gofrontend/MERGE2
-rwxr-xr-xlibgo/mkrsysinfo.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index fcc2f9f..c2a9bb9 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-6d9929a1641b180e724c2fdcdd55f6a254f1dec0
+7fb11c908ddab4932cc416f16657cec3bc878a1a
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/libgo/mkrsysinfo.sh b/libgo/mkrsysinfo.sh
index ffbbcea..32799d6 100755
--- a/libgo/mkrsysinfo.sh
+++ b/libgo/mkrsysinfo.sh
@@ -78,7 +78,7 @@ if grep '^const _epoll_data_offset ' ${OUT} >/dev/null 2>&1; then
fi
fi
# Make sure EPOLLET is positive.
-if grep '^const _EPOLLET = [0-9]' gen-sysinfo.go; then
+if grep '^const _EPOLLET = [0-9]' gen-sysinfo.go > /dev/null 2>&1; then
echo "const _EPOLLETpos = _EPOLLET" >> ${OUT}
else
echo "const _EPOLLETpos = 0x80000000" >> ${OUT}