diff options
author | Russ Cox <rsc@golang.org> | 2011-08-17 14:54:51 -0400 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2011-08-17 14:54:51 -0400 |
commit | 732b3001bb76963c05e36750823e652b8c4e5f21 (patch) | |
tree | 180caa756bd2501325487eaa2139263883052ae3 | |
parent | 1a13543aab83040f19e083436606bcee33548448 (diff) | |
download | go-732b3001bb76963c05e36750823e652b8c4e5f21.tar.gz |
gc: fix mkbuiltin
Broken by Plan 9 changes.
R=ken2
CC=golang-dev
http://codereview.appspot.com/4896050
-rw-r--r-- | src/cmd/gc/Makefile | 4 | ||||
-rwxr-xr-x | src/cmd/gc/mkbuiltin | 2 | ||||
-rw-r--r-- | src/cmd/gc/mkbuiltin1.c | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/cmd/gc/Makefile b/src/cmd/gc/Makefile index 286618ec1..0af7659e4 100644 --- a/src/cmd/gc/Makefile +++ b/src/cmd/gc/Makefile @@ -65,3 +65,7 @@ opnames.h: mkopnames go.h ./mkopnames go.h >opnames.h CLEANFILES+=*.[568] [568].out y1.tab.c yerr.h mkbuiltin1 builtin.c _builtin.c opnames.h + +mkbuiltin1: mkbuiltin1.$O + $(HOST_LD) -o $@ mkbuiltin1.$O -L"$(GOROOT)"/lib -lbio -l9 -lm $(HOST_LDFLAGS) + diff --git a/src/cmd/gc/mkbuiltin b/src/cmd/gc/mkbuiltin index 4dfff1caa..cfd6e59c1 100755 --- a/src/cmd/gc/mkbuiltin +++ b/src/cmd/gc/mkbuiltin @@ -16,7 +16,7 @@ if [ -z "$GC" ]; then exit 1 fi -gcc -o mkbuiltin1 mkbuiltin1.c +gomake mkbuiltin1 rm -f _builtin.c for i in runtime unsafe do diff --git a/src/cmd/gc/mkbuiltin1.c b/src/cmd/gc/mkbuiltin1.c index baa87fec9..ad83c0346 100644 --- a/src/cmd/gc/mkbuiltin1.c +++ b/src/cmd/gc/mkbuiltin1.c @@ -10,7 +10,7 @@ void esc(char*); -int +void main(int argc, char **argv) { char *name; @@ -64,13 +64,13 @@ begin: } esc(p); - printf("\\n\"\n", p); + printf("\\n\"\n"); } sysfatal("did not find end of imports\n"); end: printf("\t\"$$\\n\";\n"); - return 0; + exits(0); } void |