diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2024-04-17 17:10:51 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-04-17 17:10:51 +0100 |
| commit | b3f2d441439af9d36096d11036220136588def43 (patch) | |
| tree | 87e7f8808fed70fa6b3d303bd139f03de67b8621 /vendor/golang.org/x/tools/go/internal/cgo | |
| parent | update to set requesting account when deleting status (#2849) (diff) | |
| download | gotosocial-b3f2d441439af9d36096d11036220136588def43.tar.xz | |
bump to modernc.org/sqlite v1.29.7 (#2850)
Diffstat (limited to 'vendor/golang.org/x/tools/go/internal/cgo')
| -rw-r--r-- | vendor/golang.org/x/tools/go/internal/cgo/cgo_pkgconfig.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vendor/golang.org/x/tools/go/internal/cgo/cgo_pkgconfig.go b/vendor/golang.org/x/tools/go/internal/cgo/cgo_pkgconfig.go index b5bb95a63..2455be54f 100644 --- a/vendor/golang.org/x/tools/go/internal/cgo/cgo_pkgconfig.go +++ b/vendor/golang.org/x/tools/go/internal/cgo/cgo_pkgconfig.go @@ -15,12 +15,15 @@ import ( // pkgConfig runs pkg-config with the specified arguments and returns the flags it prints. func pkgConfig(mode string, pkgs []string) (flags []string, err error) { cmd := exec.Command("pkg-config", append([]string{mode}, pkgs...)...) - out, err := cmd.CombinedOutput() + out, err := cmd.Output() if err != nil { s := fmt.Sprintf("%s failed: %v", strings.Join(cmd.Args, " "), err) if len(out) > 0 { s = fmt.Sprintf("%s: %s", s, out) } + if err, ok := err.(*exec.ExitError); ok && len(err.Stderr) > 0 { + s = fmt.Sprintf("%s\nstderr:\n%s", s, err.Stderr) + } return nil, errors.New(s) } if len(out) > 0 { |