From 4c028e565071c80803c975ca9c6431dbc6bb2a88 Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Tue, 13 Jun 2017 13:05:33 -0700 Subject: [PATCH] cmd/go: adjust regexp that cleans cgo-related errors The compiler now also prints column information - make sure we use the correct regexp for compiler error cleanups. Accept both, error positions with columns and without, since column printing may be disabled with -gcflags=-C. Fixes #20628. Change-Id: I46dc921dd5c29d7b8172cd19a3df57951f60d889 Reviewed-on: https://go-review.googlesource.com/45612 Run-TryBot: Robert Griesemer Reviewed-by: Matthew Dempsky --- src/cmd/go/internal/work/build.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go index 2dfd54171a..413537d9de 100644 --- a/src/cmd/go/internal/work/build.go +++ b/src/cmd/go/internal/work/build.go @@ -1919,7 +1919,7 @@ func (b *Builder) showOutput(dir, desc, out string) { // print this error. var errPrintedOutput = errors.New("already printed output - no need to show error") -var cgoLine = regexp.MustCompile(`\[[^\[\]]+\.cgo1\.go:[0-9]+\]`) +var cgoLine = regexp.MustCompile(`\[[^\[\]]+\.cgo1\.go:[0-9]+(:[0-9]+)?\]`) var cgoTypeSigRe = regexp.MustCompile(`\b_Ctype_\B`) // run runs the command given by cmdline in the directory dir. -- 2.50.0