From: Joe Poirier <jdpoirier@gmail.com>
Date: Sun, 17 Mar 2013 21:56:38 +0000 (+1100)
Subject: misc/dist: fix Windows breakage
X-Git-Tag: go1.1rc2~465
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b7b4783622b4e21e7fb515b614bc651fe6210d7c;p=gostls13.git

misc/dist: fix Windows breakage

The files could use some attention on the
Windows side but better to wait until after
the upcoming release.

R=golang-dev, adg
CC=golang-dev
https://golang.org/cl/7621044
---

diff --git a/misc/dist/bindist.go b/misc/dist/bindist.go
index 29454c73cf..2d633bef97 100644
--- a/misc/dist/bindist.go
+++ b/misc/dist/bindist.go
@@ -386,9 +386,13 @@ func (b *Build) tour() error {
 	}
 
 	// Copy gotour binary to tool directory as "tour"; invoked as "go tool tour".
+	gotour := "gotour"
+	if runtime.GOOS == "windows" {
+		gotour = "gotour.exe"
+	}
 	return cp(
 		filepath.Join(b.root, "pkg", "tool", b.OS+"_"+b.Arch, "tour"),
-		filepath.Join(b.gopath, "bin", "gotour"),
+		filepath.Join(b.gopath, "bin", gotour),
 	)
 }
 
@@ -620,8 +624,11 @@ func cp(dst, src string) error {
 		return err
 	}
 	defer df.Close()
-	if err := df.Chmod(fi.Mode()); err != nil {
-		return err
+	// Windows doesn't currently implement Fchmod
+	if runtime.GOOS != "windows" {
+		if err := df.Chmod(fi.Mode()); err != nil {
+			return err
+		}
 	}
 	_, err = io.Copy(df, sf)
 	return err