diff options
Diffstat (limited to 'src/cmd/dist/build.c')
| -rw-r--r-- | src/cmd/dist/build.c | 53 |
1 files changed, 40 insertions, 13 deletions
diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c index dda45ca62..fd6a329c4 100644 --- a/src/cmd/dist/build.c +++ b/src/cmd/dist/build.c @@ -313,7 +313,6 @@ static char *unreleased[] = { "src/cmd/cov", "src/cmd/prof", "src/pkg/old", - "src/pkg/exp", }; // setup sets up the tree for the initial build. @@ -795,6 +794,9 @@ install(char *dir) bpathf(&b1, "%s/arch_%s.h", bstr(&path), goarch), 0); copy(bpathf(&b, "%s/defs_GOOS_GOARCH.h", workdir), bpathf(&b1, "%s/defs_%s_%s.h", bstr(&path), goos, goarch), 0); + p = bpathf(&b1, "%s/signal_%s_%s.h", bstr(&path), goos, goarch); + if(isfile(p)) + copy(bpathf(&b, "%s/signal_GOOS_GOARCH.h", workdir), p, 0); copy(bpathf(&b, "%s/os_GOOS.h", workdir), bpathf(&b1, "%s/os_%s.h", bstr(&path), goos), 0); copy(bpathf(&b, "%s/signals_GOOS.h", workdir), @@ -940,6 +942,8 @@ install(char *dir) } vadd(&compile, "-I"); vadd(&compile, workdir); + vadd(&compile, "-I"); + vadd(&compile, bprintf(&b, "%s/pkg/%s_%s", goroot, goos, goarch)); vadd(&compile, "-D"); vadd(&compile, bprintf(&b, "GOOS_%s", goos)); vadd(&compile, "-D"); @@ -1045,7 +1049,16 @@ out: static bool matchfield(char *f) { - return streq(f, goos) || streq(f, goarch) || streq(f, "cmd_go_bootstrap"); + char *p; + bool res; + + p = xstrrchr(f, ','); + if(p == nil) + return streq(f, goos) || streq(f, goarch) || streq(f, "cmd_go_bootstrap") || streq(f, "go1.1"); + *p = 0; + res = matchfield(f) && matchfield(p+1); + *p = ','; + return res; } // shouldbuild reports whether we should build this file. @@ -1071,7 +1084,8 @@ shouldbuild(char *file, char *dir) name = lastelem(file); if(streq(name, "goos.c") || streq(name, "flag.c")) return 1; - return 0; + if(!contains(name, "plan9")) + return 0; } if(streq(dir, "libbio")) return 0; @@ -1574,7 +1588,7 @@ cmdclean(int argc, char **argv) void cmdbanner(int argc, char **argv) { - char *pathsep; + char *pathsep, *pid, *ns; Buf b, b1, search, path; ARGBEGIN{ @@ -1598,15 +1612,28 @@ cmdbanner(int argc, char **argv) xprintf("Installed Go for %s/%s in %s\n", goos, goarch, goroot); xprintf("Installed commands in %s\n", gobin); - // Check that gobin appears in $PATH. - xgetenv(&b, "PATH"); - pathsep = ":"; - if(streq(gohostos, "windows")) - pathsep = ";"; - bprintf(&b1, "%s%s%s", pathsep, bstr(&b), pathsep); - bprintf(&search, "%s%s%s", pathsep, gobin, pathsep); - if(xstrstr(bstr(&b1), bstr(&search)) == nil) - xprintf("*** You need to add %s to your PATH.\n", gobin); + if(streq(gohostos, "plan9")) { + // Check that gobin is bound before /bin. + readfile(&b, "#c/pid"); + bsubst(&b, " ", ""); + pid = btake(&b); + bprintf(&b, "/proc/%s/ns", pid); + ns = btake(&b); + readfile(&b, ns); + bprintf(&search, "bind -b %s /bin\n", gobin); + if(xstrstr(bstr(&b), bstr(&search)) == nil) + xprintf("*** You need to bind %s before /bin.\n", gobin); + } else { + // Check that gobin appears in $PATH. + xgetenv(&b, "PATH"); + pathsep = ":"; + if(streq(gohostos, "windows")) + pathsep = ";"; + bprintf(&b1, "%s%s%s", pathsep, bstr(&b), pathsep); + bprintf(&search, "%s%s%s", pathsep, gobin, pathsep); + if(xstrstr(bstr(&b1), bstr(&search)) == nil) + xprintf("*** You need to add %s to your PATH.\n", gobin); + } if(streq(gohostos, "darwin")) { if(isfile(bpathf(&path, "%s/cov", tooldir))) |