build: fix cgo with -j2

a b: c expands to multiple rules,
which then run in parallel.

R=r, iant
CC=golang-dev
https://golang.org/cl/2007047

diff --git a/src/Make.pkg b/src/Make.pkg
index 239820b1521957348db541ccafacf4b86e141753..1f5f2823b910a85a0807761c37caf9ffd25b0234 100644 (file)
--- a/src/Make.pkg
+++ b/src/Make.pkg
@@ -102,14 +102,11 @@ dir:
 #      x.cgo2.c        - C implementations compiled with gcc to create a dynamic library
 #
 
-_cgo_defun.c _cgo_gotypes.go _cgo_export.c _cgo_export.h: $(CGOFILES)
+_cgo_defun.c: $(CGOFILES)
        CGOPKGPATH=$(dir) cgo -- $(CGO_CFLAGS) $(CGOFILES)
 
 # Ugly but necessary
-%.cgo1.go: _cgo_defun.c _cgo_gotypes.go
-       @true
-
-%.cgo2.c: _cgo_defun.c _cgo_gotypes.go
+_cgo_gotypes.go _cgo_export.c _cgo_export.h %.cgo1.go %.cgo2.c: _cgo_defun.c
        @true
 
 %.cgo2.o: %.cgo2.c