Fix generated Makefile for pybindgen and capi

Author: b-long

bind/gen.go

@@ -436,10 +436,10 @@ def Init():
 
 	`
 
-	// 3 = gencmd, 4 = vm, 5 = libext 6 = extraGccArgs, 7 = CFLAGS, 8 = LDLFAGS,
-	// 9 = windows special declspec hack, 10 = gopy version
+	// 3 = gencmd, 4 = vm, 5 = libext, 6 = module file name,
+	// 7 = windows special declspec hack, 8 = gopy version
 	MakefileTemplate = `# Makefile for python interface for package %[1]s.
-# File is generated by gopy version %[10]s. Do not edit.
+# File is generated by gopy version %[8]s. Do not edit.
 # %[2]s
 
 GOCMD=go
@@ -448,11 +448,6 @@ GOIMPORTS=goimports
 PYTHON=%[4]s
 LIBEXT=%[5]s
 
-# get the CC and flags used to build python:
-GCC = $(shell $(GOCMD) env CC)
-CFLAGS = %[7]s
-LDFLAGS = %[8]s
-
 all: gen build
 
 gen:
@@ -464,20 +459,21 @@ build:
 	- rm %[1]s.c
 	# goimports is needed to ensure that the imports list is valid
 	$(GOIMPORTS) -w %[1]s.go
-	# generate %[1]s_go$(LIBEXT) from %[1]s.go -- the cgo wrappers to go functions
+	# build %[1]s.go -- the cgo wrappers to go functions -- once, only for the
+	# %[1]s_go.h header it writes, which %[1]s.c includes
 	$(GOBUILD) -buildmode=c-shared -o %[1]s_go$(LIBEXT) %[1]s.go
-	# use pybindgen to build the %[1]s.c file which are the CPython wrappers to cgo wrappers..
-	# note: pip install pybindgen to get pybindgen if this fails
-	$(PYTHON) build.py
-	# build the _%[1]s$(LIBEXT) library that contains the cgo and CPython wrappers
-	# generated %[1]s.py python wrapper imports this c-code package
-	%[9]s
-	$(GCC) %[1]s.c %[6]s %[1]s_go$(LIBEXT) -o _%[1]s$(LIBEXT) $(CFLAGS) $(LDFLAGS) -fPIC --shared -w
-	
+	- rm %[1]s_go$(LIBEXT)
+	# write %[1]s.c, the CPython wrappers to the cgo wrappers
+	$(PYTHON) build.py%[7]s
+	# build the module %[1]s.py imports: cgo compiles %[1]s.c into the same
+	# shared library as the go code, so it depends on nothing but python
+	$(GOBUILD) -buildmode=c-shared -o %[6]s .
+
 `
 
-	// same argument positions as MakefileTemplate, though only 1-5 and 10 are used:
-	// cffi needs none of the CPython CFLAGS/LDFLAGS that building %[1]s.c would.
+	// 1 = package name, 2 = gopy command, 3 = gencmd, 4 = vm, 5 = libext,
+	// 10 = gopy version (6-9 are unused): cffi needs no %[1]s.c, and none of
+	// the CPython flags that building one would.
 	MakefileTemplateCFFI = `# Makefile for python interface for package %[1]s, using cffi.
 # File is generated by gopy version %[10]s. Do not edit.
 # %[2]s
@@ -896,10 +892,12 @@ func (g *pyGen) genMakefile() {
 	} else {
 		winhack := ""
 		if WindowsOS {
-			winhack = fmt.Sprintf(`# windows-only sed hack here to fix pybindgen declaration of PyInit
-  sed -i "s/ PyInit_/ __declspec(dllexport) PyInit_/g" %s.c`, g.cfg.Name)
+			winhack = fmt.Sprintf(`
+	# windows-only sed hack here to fix pybindgen declaration of PyInit
+	sed -i "s/ PyInit_/ __declspec(dllexport) PyInit_/g" %s.c`, g.cfg.Name)
 		}
-		g.makefile.Printf(MakefileTemplate, g.cfg.Name, g.cfg.Cmd, gencmd, g.cfg.VM, g.libext, g.extraGccArgs, pycfg.CFlags, pycfg.LdFlags, winhack, g.cfg.Version)
+		g.makefile.Printf(MakefileTemplate, g.cfg.Name, g.cfg.Cmd, gencmd, g.cfg.VM, g.libext,
+			ExtModuleName(g.cfg.Name, g.libext, pycfg), winhack, g.cfg.Version)
 	}
 }
 

main_test.go

@@ -467,16 +467,9 @@ func TestBindSimple(t *testing.T) {
 // TestMakefile builds _examples/simple with the Makefile gopy gen writes,
 // rather than with gopy build, under the backend GOPY_BACKEND selects.
 func TestMakefile(t *testing.T) {
-	backend, err := bind.BackendFromEnv()
-	if err != nil {
+	if _, err := bind.BackendFromEnv(); err != nil {
 		t.Fatal(err)
 	}
-	if backend == bind.BackendPyBindGen || backend == bind.BackendCAPI {
-		// TODO: their (shared) Makefile links _simple against a separate
-		// simple_go shared library with no rpath, so the result only imports
-		// with that library's directory on the loader's search path.
-		t.Skipf("the %s backend's Makefile output doesn't import as-is", backend)
-	}
 	if _, err := exec.LookPath("make"); err != nil {
 		t.Skip("make not found")
 	}