diff options
author | Russ Cox <rsc@golang.org> | 2014-11-22 13:38:29 -0500 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2014-11-22 13:38:29 -0500 |
commit | f6818121ed601dcbb799717d5309e4b7a1d7a68a (patch) | |
tree | 75c74be18f8ad03ef9db1b079897a94ed5ca58c3 | |
parent | 791fec05e4505af1bfac30a79170315ad02a6d90 (diff) | |
download | go-f6818121ed601dcbb799717d5309e4b7a1d7a68a.tar.gz go-f6818121ed601dcbb799717d5309e4b7a1d7a68a.zip |
[release-branch.go1.4] cmd/go: fix running pprof on windows.
««« CL 176170043 / 61bbf19823d5
cmd/go: fix running pprof on windows.
Fixes #9149.
LGTM=alex.brainman, rsc
R=rsc, dave, alex.brainman
CC=golang-codereviews
https://golang.org/cl/176170043
»»»
TBR=minux
CC=golang-codereviews
https://golang.org/cl/175550043
-rw-r--r-- | src/cmd/go/tool.go | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/cmd/go/tool.go b/src/cmd/go/tool.go index c96161e0f9..3f11c3e3d4 100644 --- a/src/cmd/go/tool.go +++ b/src/cmd/go/tool.go @@ -47,7 +47,7 @@ const toolWindowsExtension = ".exe" func tool(toolName string) string { toolPath := filepath.Join(toolDir, toolName) - if toolIsWindows && toolName != "pprof" { + if toolIsWindows { toolPath += toolWindowsExtension } // Give a nice message if there is no tool with that name. @@ -91,16 +91,6 @@ func runTool(cmd *Command, args []string) { if toolPath == "" { return } - if toolIsWindows && toolName == "pprof" { - args = append([]string{"perl", toolPath}, args[1:]...) - var err error - toolPath, err = exec.LookPath("perl") - if err != nil { - fmt.Fprintf(os.Stderr, "go tool: perl not found\n") - setExitStatus(3) - return - } - } if toolN { fmt.Printf("%s %s\n", toolPath, strings.Join(args[1:], " ")) return |