diff options
| author | Ian Lance Taylor <iant@golang.org> | 2022-04-19 06:49:22 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2022-04-19 12:49:42 -0700 |
| commit | 4a1a72a89c65a6c1d01f717a20440d08c958a6e8 (patch) | |
| tree | 6ff1209e763b9f73ee9199cfa31a48b6cf0d9c1a | |
| parent | 90a29845bfe7d6002e6c2fd49a97820b00fbc4a3 (diff) | |
libgo: make a couple of sed uses POSIX compliant
Patch from Jonathan Wakely.
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/401054
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/Makefile.am | 2 | ||||
| -rw-r--r-- | libgo/Makefile.in | 2 | ||||
| -rwxr-xr-x | libgo/match.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 2321f67ca5d..63238715bd0 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -22b0ccda3aa4d16f770a26a3eb251f8da615c318 +99ca6be406a5781be078ff23f45a72b4c84b16e3 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/Makefile.am b/libgo/Makefile.am index e0a1eec52a2..a5d4b6a3525 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -1305,7 +1305,7 @@ check-tail: check-recursive check-multi if test "$$untested" -ne "0"; then \ echo "# of untested testcases $$untested" >> libgo.sum; \ fi; \ - echo `echo $(GOC) | sed -e 's/ .*//'` `$(GOC) -v 2>&1 | grep " version" | sed -n -e 's/.* \(version.*$$\)/\1/p'` >> libgo.sum; \ + echo `echo $(GOC) | sed -e 's/ .*//'` `$(GOC) -v 2>&1 | grep " version" | sed -n -e 's/.* \(version.*\)$$/\1/p'` >> libgo.sum; \ echo >> libgo.log; \ echo "runtest completed at `date`" >> libgo.log; \ if test "$$fail" -ne "0"; then \ diff --git a/libgo/Makefile.in b/libgo/Makefile.in index 7bef5df90d1..22f48a52938 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -3189,7 +3189,7 @@ check-tail: check-recursive check-multi if test "$$untested" -ne "0"; then \ echo "# of untested testcases $$untested" >> libgo.sum; \ fi; \ - echo `echo $(GOC) | sed -e 's/ .*//'` `$(GOC) -v 2>&1 | grep " version" | sed -n -e 's/.* \(version.*$$\)/\1/p'` >> libgo.sum; \ + echo `echo $(GOC) | sed -e 's/ .*//'` `$(GOC) -v 2>&1 | grep " version" | sed -n -e 's/.* \(version.*\)$$/\1/p'` >> libgo.sum; \ echo >> libgo.log; \ echo "runtest completed at `date`" >> libgo.log; \ if test "$$fail" -ne "0"; then \ diff --git a/libgo/match.sh b/libgo/match.sh index 139d0cdbe64..7ed587ff794 100755 --- a/libgo/match.sh +++ b/libgo/match.sh @@ -100,7 +100,7 @@ fi gobuild() { line=$(echo "$1" | sed -e 's|//go:build ||') - line=$(echo "$line" | sed -e 's/go1\.[0-9]\+/1/g' -e 's/goexperiment\./goexperiment/') + line=$(echo "$line" | sed -e 's/go1\.[0-9][0-9]*/1/g' -e 's/goexperiment\./goexperiment/') line=" $line " wrap='[ ()!&|]' for ones in $goarch $goos $cgotag $cmdlinetag gccgo goexperimentfieldtrack; do |