diff options
| author | Ondřej Surý <ondrej@sury.org> | 2012-03-26 16:50:58 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2012-03-26 16:50:58 +0200 |
| commit | 519725bb3c075ee2462c929f5997cb068e18466a (patch) | |
| tree | 5b162e8488ad147a645048c073577821b4a2bee9 /src/cmd/dist/build.c | |
| parent | 842623c5dd2819d980ca9c58048d6bc6ed82475f (diff) | |
| download | golang-upstream-weekly/2012.03.22.tar.gz | |
Imported Upstream version 2012.03.22upstream-weekly/2012.03.22
Diffstat (limited to 'src/cmd/dist/build.c')
| -rw-r--r-- | src/cmd/dist/build.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c index a40853fad..3936f7621 100644 --- a/src/cmd/dist/build.c +++ b/src/cmd/dist/build.c @@ -209,7 +209,7 @@ findgoversion(void) // What are the tags along the current branch? tag = ""; rev = "."; - run(&b, goroot, CheckExit, "hg", "log", "-b", bstr(&branch), "--template", "{tags} + ", nil); + run(&b, goroot, CheckExit, "hg", "log", "-b", bstr(&branch), "-r", ".:0", "--template", "{tags} + ", nil); splitfields(&tags, bstr(&b)); nrev = 0; for(i=0; i<tags.len; i++) { @@ -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. @@ -1351,6 +1353,9 @@ cmdbootstrap(int argc, char **argv) goversion = findgoversion(); setup(); + xsetenv("GOROOT", goroot); + xsetenv("GOROOT_FINAL", goroot_final); + // For the main bootstrap, building for host os/arch. oldgoos = goos; oldgoarch = goarch; |