convert non-low-level non-google pkg code

to whole-package compilation.

R=r
OCL=33070
CL=33101

2 files changed, 7 insertions, 57 deletions

diff --git a/src/pkg/exec/Makefile b/src/pkg/exec/Makefile
index 679cc39c0..9927eb3e7 100644
--- a/src/pkg/exec/Makefile
+++ b/src/pkg/exec/Makefile
@@ -2,59 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-# DO NOT EDIT.  Automatically generated by gobuild.
-# gobuild -m >Makefile
-
-D=
-
 include $(GOROOT)/src/Make.$(GOARCH)
-AR=gopack
-
-default: packages
-
-clean:
-	rm -rf *.[$(OS)] *.a [$(OS)].out _obj
-
-test: packages
-	gotest
-
-coverage: packages
-	gotest
-	6cov -g `pwd` | grep -v '_test\.go:'
-
-%.$O: %.go
-	$(GC) -I_obj $*.go
-
-%.$O: %.c
-	$(CC) $*.c
-
-%.$O: %.s
-	$(AS) $*.s
-
-O1=\
-	exec.$O\
-
-
-phases: a1
-_obj$D/exec.a: phases
-
-a1: $(O1)
-	$(AR) grc _obj$D/exec.a exec.$O
-	rm -f $(O1)
-
-
-newpkg: clean
-	mkdir -p _obj$D
-	$(AR) grc _obj$D/exec.a
-
-$(O1): newpkg
-$(O2): a1
-
-nuke: clean
-	rm -f $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D/exec.a
 
-packages: _obj$D/exec.a
+TARG=exec
+GOFILES=\
+	exec.go\
 
-install: packages
-	test -d $(GOROOT)/pkg && mkdir -p $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D
-	cp _obj$D/exec.a $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D/exec.a
+include $(GOROOT)/src/Make.pkg
diff --git a/src/pkg/exec/exec_test.go b/src/pkg/exec/exec_test.go
index 9a9fca2e7..d5585029e 100644
--- a/src/pkg/exec/exec_test.go
+++ b/src/pkg/exec/exec_test.go
@@ -5,14 +5,13 @@
 package exec
 
 import (
-	"exec";
 	"io";
 	"testing";
 )
 
 func TestRunCat(t *testing.T) {
-	cmd, err := exec.Run("/bin/cat", []string{"cat"}, nil,
-		exec.Pipe, exec.Pipe, exec.DevNull);
+	cmd, err := Run("/bin/cat", []string{"cat"}, nil,
+		Pipe, Pipe, DevNull);
 	if err != nil {
 		t.Fatalf("opencmd /bin/cat: %v", err);
 	}
@@ -32,7 +31,7 @@ func TestRunCat(t *testing.T) {
 
 func TestRunEcho(t *testing.T) {
 	cmd, err := Run("/bin/echo", []string{"echo", "hello", "world"}, nil,
-		exec.DevNull, exec.Pipe, exec.DevNull);
+		DevNull, Pipe, DevNull);
 	if err != nil {
 		t.Fatalf("opencmd /bin/echo: %v", err);
 	}