diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-09-13 17:07:20 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-09-13 17:07:20 +0000 |
| commit | 57cccc860e501be56096a2863ae571175cb87960 (patch) | |
| tree | 3d596d4ce968124409d6eb1c762652624895d11e | |
| parent | 9a235e7e85aec64b023b6725c5a2f3fc3a122d3b (diff) | |
| download | gcc-57cccc860e501be56096a2863ae571175cb87960.zip gcc-57cccc860e501be56096a2863ae571175cb87960.tar.gz gcc-57cccc860e501be56096a2863ae571175cb87960.tar.bz2 | |
libgo: don't use \? in grep pattern
It's not supported by Solaris grep. Just use * instead; it matches
more but it shouldn't matter.
Fixes https://gcc.gnu.org/PR91764
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/195238
From-SVN: r275700
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rwxr-xr-x | libgo/match.sh | 2 | ||||
| -rwxr-xr-x | libgo/testsuite/gotest | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index f950ecd..522d408 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -ceb1e4f5614b4772eed44f9cf57780e52f44753e +5af62eda697da21155091cf5375ed9edb4639b67 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/match.sh b/libgo/match.sh index c8fb960..281acf7 100755 --- a/libgo/match.sh +++ b/libgo/match.sh @@ -135,7 +135,7 @@ for f in $gofiles; do if test x$tag1 != xnonmatchingtag -a x$tag2 != xnonmatchingtag; then # Pipe through cat so that `set -e` doesn't affect fgrep. - tags=`sed '/^package /q' < $f | grep '^// \?+build ' | cat` + tags=`sed '/^package /q' < $f | grep '^// *+build ' | cat` omatch=true first=true match=false diff --git a/libgo/testsuite/gotest b/libgo/testsuite/gotest index 9d46916..4f1a2f8 100755 --- a/libgo/testsuite/gotest +++ b/libgo/testsuite/gotest @@ -326,7 +326,7 @@ x) esac if test x$tag1 != xnonmatchingtag -a x$tag2 != xnonmatchingtag; then - tags=`sed '/^package /q' < $f | grep '^// \?+build '` + tags=`sed '/^package /q' < $f | grep '^// *+build '` omatch=true first=true match=false |