From 102c1a7c961c503379cdfe09476fa26662792c77 Mon Sep 17 00:00:00 2001
From: Alex Brainman <alex.brainman@gmail.com>
Date: Fri, 23 Dec 2011 09:46:30 +1100
Subject: [PATCH] go/build: (*Tree).BinDir should not return path with / in it
 on windows

R=rsc
CC=golang-dev
https://golang.org/cl/5502064
---
 src/pkg/go/build/path.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pkg/go/build/path.go b/src/pkg/go/build/path.go
index 5b4d9243e67..7a281800c28 100644
--- a/src/pkg/go/build/path.go
+++ b/src/pkg/go/build/path.go
@@ -57,7 +57,7 @@ func (t *Tree) PkgDir() string {
 func (t *Tree) BinDir() string {
 	if t.Goroot {
 		if gobin := os.Getenv("GOBIN"); gobin != "" {
-			return gobin
+			return filepath.Clean(gobin)
 		}
 	}
 	return filepath.Join(t.Path, "bin")