gc: fix mkbuiltin

Broken by Plan 9 changes.

R=ken2
CC=golang-dev
https://golang.org/cl/4896050

diff --git a/src/cmd/gc/Makefile b/src/cmd/gc/Makefile
index 286618ec1b1f1161e264693b2a1b361092b70794..0af7659e4d4aa21c0f6457c25f86d832f9b02648 100644 (file)
--- 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 4dfff1caa54cd07e1f424020cf820601b57f0e75..cfd6e59c1cc3bdcc45fd14bf807ea2b2b9160420 100755 (executable)
--- 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 baa87fec9e32a4b033eac7ccc07d151eece009c0..ad83c0346b6d787e40e9a5a3c571aebb764feb7f 100644 (file)
--- 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