aboutsummaryrefslogtreecommitdiff
path: root/src/cmd
diff options
context:
space:
mode:
authorAkshat Kumar <seed@mail.nanosouffle.net>2013-03-11 13:34:57 -0700
committerRuss Cox <rsc@golang.org>2013-03-11 13:34:57 -0700
commit76374412c36ccbac91c86a033b37732661787246 (patch)
tree23c65dabe2782cfc6c0036e2a5512aeb50c9d786 /src/cmd
parent386ad0ab9056e2f9a0d05d7f86c8ae323262228b (diff)
downloadgo-76374412c36ccbac91c86a033b37732661787246.tar.xz
lib9, cmd/dist, cmd/ld: Plan 9: fix build
lib9: fix runcmd, removeall, and tempdir functions cmd/dist: Include run_plan9.c and tempdir_plan9.c from lib9 for build, and in general consider file names containing "plan9" for building. cmd/ld: provide function args for the new functions from lib9. R=rsc, rminnich, ality, bradfitz CC=golang-dev https://golang.org/cl/7666043
Diffstat (limited to 'src/cmd')
-rw-r--r--src/cmd/dist/build.c3
-rw-r--r--src/cmd/ld/lib.c5
2 files changed, 7 insertions, 1 deletions
diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c
index 5150ac3f29..bac7439e61 100644
--- a/src/cmd/dist/build.c
+++ b/src/cmd/dist/build.c
@@ -1070,7 +1070,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;
diff --git a/src/cmd/ld/lib.c b/src/cmd/ld/lib.c
index b895e5088e..cbd947dc82 100644
--- a/src/cmd/ld/lib.c
+++ b/src/cmd/ld/lib.c
@@ -556,6 +556,11 @@ hostobjs(void)
}
}
+// provided by lib9
+int runcmd(char**);
+char* mktempdir(void);
+void removeall(char*);
+
static void
rmtemp(void)
{