misc/dist: don't ship cmd/cov or cmd/prof

Fixes #3317

R=golang-dev, dsymonds
CC=golang-dev
https://golang.org/cl/5784083

diff --git a/misc/dist/bindist.go b/misc/dist/bindist.go
index 8fd3bfde0fc41ec9c0f893c4bff15b8329dab44f..b03fd706db71fd970514f5d5ebc9b1e64842943b 100644 (file)
--- a/misc/dist/bindist.go
+++ b/misc/dist/bindist.go
@@ -43,6 +43,8 @@ const (
 )
 
 var preBuildCleanFiles = []string{
+       "src/cmd/cov",
+       "src/cmd/prof",
        "src/pkg/exp",
        "src/pkg/old",
 }

diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c
index acd7347aa89753f743c79173e20d080a4585e56d..3936f76210df5c5be14ad8530ef3d6a615ec2c98 100644 (file)
--- a/src/cmd/dist/build.c
+++ b/src/cmd/dist/build.c
@@ -1214,6 +1214,8 @@ clean(void)
        vinit(&dir);
 
        for(i=0; i<nelem(cleantab); i++) {
+               if((streq(cleantab[i], "cmd/cov") || streq(cleantab[i], "cmd/prof")) && !isdir(cleantab[i]))
+                       continue;
                bpathf(&path, "%s/src/%s", goroot, cleantab[i]);
                xreaddir(&dir, bstr(&path));
                // Remove generated files.