5 files changed, 13 insertions, 27 deletions
diff --git a/misc/cgo/testso/Makefile b/misc/cgo/testso/Makefile
deleted file mode 100644
index e472cf212..000000000
--- a/misc/cgo/testso/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2011 The Go Authors.  All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../src/Make.inc
-
-TARG=cgosotest
-
-CGO_DEPS+=libcgoso.so
-CGO_LDFLAGS+=-lcgoso -L.
-CLEANFILES+=out libcgoso.so
-CGOFILES=\
-	cgoso.go\
-
-include ../../../src/Make.pkg
-
-libcgoso.so: cgoso_c.c
-	gcc cgoso_c.c -fPIC -o $@ $(_CGO_CFLAGS_$(GOARCH)) $(_CGO_LDFLAGS_$(GOOS))
-
-out: install main.go
-	$(GC) $(GCFLAGS) $(GCIMPORTS) main.go
-	$(LD) -o $@ main.$O
diff --git a/misc/cgo/testso/cgoso.go b/misc/cgo/testso/cgoso.go
index 6eb9f40e3..44fb616c1 100644
--- a/misc/cgo/testso/cgoso.go
+++ b/misc/cgo/testso/cgoso.go
@@ -4,7 +4,10 @@
 
 package cgosotest
 
-//void sofunc(void);
+/*
+#cgo LDFLAGS: -L. -lcgosotest
+void sofunc(void);
+*/
 import "C"
 
 func Test() {
diff --git a/misc/cgo/testso/cgoso_c.c b/misc/cgo/testso/cgoso_c.c
index e29f7e807..8c15a6b9f 100644
--- a/misc/cgo/testso/cgoso_c.c
+++ b/misc/cgo/testso/cgoso_c.c
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build ignore
+
 void sofunc(void)
 {
 	extern void goCallback(void);
diff --git a/misc/cgo/testso/main.go b/misc/cgo/testso/main.go
index 672ab262b..88aa4322d 100644
--- a/misc/cgo/testso/main.go
+++ b/misc/cgo/testso/main.go
@@ -2,9 +2,11 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build ignore
+
 package main
 
-import "cgosotest"
+import "."
 
 func main() {
 	cgosotest.Test()
diff --git a/misc/cgo/testso/test.bash b/misc/cgo/testso/test.bash
index f275eb572..ecef873c8 100755
--- a/misc/cgo/testso/test.bash
+++ b/misc/cgo/testso/test.bash
@@ -4,6 +4,7 @@
 # license that can be found in the LICENSE file.
 
 set -e
-gomake out
-LD_LIBRARY_PATH=. ./out
-gomake clean
+gcc $(go env GOGCCFLAGS) -shared -o libcgosotest.so cgoso_c.c
+go build main.go
+LD_LIBRARY_PATH=. ./main
+rm -f libcgosotest.so main