From: Russ Cox <rsc@golang.org>
Date: Sat, 22 Nov 2014 18:38:29 +0000 (-0500)
Subject: [release-branch.go1.4] cmd/go: fix running pprof on windows.
X-Git-Tag: go1.4rc2~6
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=f6818121ed601dcbb799717d5309e4b7a1d7a68a;p=gostls13.git

[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
---

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