diff options
Diffstat (limited to 'src/go/internal/srcimporter/srcimporter.go')
| -rw-r--r-- | src/go/internal/srcimporter/srcimporter.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/go/internal/srcimporter/srcimporter.go b/src/go/internal/srcimporter/srcimporter.go index d7ec6691bc..ea6f01280a 100644 --- a/src/go/internal/srcimporter/srcimporter.go +++ b/src/go/internal/srcimporter/srcimporter.go @@ -136,7 +136,7 @@ func (p *Importer) ImportFrom(path, srcDir string, mode types.ImportMode) (*type setUsesCgo(&conf) file, err := p.cgo(bp) if err != nil { - return nil, err + return nil, fmt.Errorf("error processing cgo for package %q: %w", bp.ImportPath, err) } files = append(files, file) } @@ -223,9 +223,9 @@ func (p *Importer) cgo(bp *build.Package) (*ast.File, error) { args = append(args, bp.CgoCPPFLAGS...) if len(bp.CgoPkgConfig) > 0 { cmd := exec.Command("pkg-config", append([]string{"--cflags"}, bp.CgoPkgConfig...)...) - out, err := cmd.CombinedOutput() + out, err := cmd.Output() if err != nil { - return nil, err + return nil, fmt.Errorf("pkg-config --cflags: %w", err) } args = append(args, strings.Fields(string(out))...) } @@ -237,7 +237,7 @@ func (p *Importer) cgo(bp *build.Package) (*ast.File, error) { cmd := exec.Command(args[0], args[1:]...) cmd.Dir = bp.Dir if err := cmd.Run(); err != nil { - return nil, err + return nil, fmt.Errorf("go tool cgo: %w", err) } return parser.ParseFile(p.fset, filepath.Join(tmpdir, "_cgo_gotypes.go"), nil, 0) |