From: Shenghou Ma <minux.ma@gmail.com>
Date: Thu, 3 May 2012 16:58:48 +0000 (+0800)
Subject: cmd/dist: remove stray src/pkg/runtime/z* when cleaning
X-Git-Tag: go1.1rc2~3260
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=52ec4aa24aa6af413d950bfb50de56315a61fd73;p=gostls13.git

cmd/dist: remove stray src/pkg/runtime/z* when cleaning

R=golang-dev, bradfitz, dave, rsc, lstoakes, rsc
CC=golang-dev
https://golang.org/cl/6180044
---

diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c
index b8a135515a..b2f852fce3 100644
--- a/src/cmd/dist/build.c
+++ b/src/cmd/dist/build.c
@@ -1285,6 +1285,15 @@ clean(void)
 			xremove(bpathf(&b, "%s/%s", bstr(&path), cleantab[i]+4));
 	}
 
+	// remove src/pkg/runtime/z* unconditionally
+	vreset(&dir);
+	bpathf(&path, "%s/src/pkg/runtime", goroot);
+	xreaddir(&dir, bstr(&path));
+	for(j=0; j<dir.len; j++) {
+		if(hasprefix(dir.p[j], "z"))
+			xremove(bpathf(&b, "%s/%s", bstr(&path), dir.p[j]));
+	}
+
 	if(rebuildall) {
 		// Remove object tree.
 		xremoveall(bpathf(&b, "%s/pkg/obj/%s_%s", goroot, gohostos, gohostarch));