gopy: add environment variable support

Author: Keithcat1

bind/utils.go

@@ -97,14 +97,28 @@ func getPythonConfig(vm string) (pyconfig, error) {
 	code := `import sys
 import distutils.sysconfig as ds
 import json
-print(json.dumps({
-	"version": sys.version_info.major,
-	"incdir":  ds.get_python_inc(),
-	"libdir":  ds.get_config_var("LIBDIR"),
-	"libpy":   ds.get_config_var("LIBRARY"),
-	"shlibs":  ds.get_config_var("SHLIBS"),
-	"syslibs": ds.get_config_var("SYSLIBS"),
-	"shlinks": ds.get_config_var("LINKFORSHARED"),
+import os
+version=sys.version_info.major
+
+if "GOPY_INCLUDE" in os.environ and "GOPY_LIBDIR" in os.environ and "GOPY_PYLIB" in os.environ:
+	print(json.dumps({
+		"version": version,
+		"incdir": os.environ["GOPY_INCLUDE"],
+		"libdir": os.environ["GOPY_LIBDIR"],
+		"libpy": os.environ["GOPY_PYLIB"],
+		"shlibs":  ds.get_config_var("SHLIBS"),
+		"syslibs": ds.get_config_var("SYSLIBS"),
+		"shlinks": ds.get_config_var("LINKFORSHARED"),
+}))
+else:
+	print(json.dumps({
+		"version": sys.version_info.major,
+		"incdir":  ds.get_python_inc(),
+		"libdir":  ds.get_config_var("LIBDIR"),
+		"libpy":   ds.get_config_var("LIBRARY"),
+		"shlibs":  ds.get_config_var("SHLIBS"),
+		"syslibs": ds.get_config_var("SYSLIBS"),
+		"shlinks": ds.get_config_var("LINKFORSHARED"),
 }))
 `
 
@@ -138,6 +152,8 @@ print(json.dumps({
 	}
 
 	raw.IncDir = filepath.ToSlash(raw.IncDir)
+	raw.LibDir = filepath.ToSlash(raw.LibDir)
+
 	if strings.HasSuffix(raw.LibPy, ".a") {
 		raw.LibPy = raw.LibPy[:len(raw.LibPy)-len(".a")]
 	}

cmd_build.go

@@ -6,14 +6,15 @@ package main
 
 import (
 	"fmt"
+	"github.com/go-python/gopy/bind"
+	"github.com/gonuts/commander"
+	"github.com/gonuts/flag"
 	"log"
 	"os"
 	"os/exec"
+	"path/filepath"
+	"runtime"
 	"strings"
-
-	"github.com/go-python/gopy/bind"
-	"github.com/gonuts/commander"
-	"github.com/gonuts/flag"
 )
 
 func gopyMakeCmdBuild() *commander.Command {
@@ -170,28 +171,48 @@ func runBuild(mode bind.BuildMode, odir, outname, cmdstr, vm, mainstr string, sy
 			return err
 		}
 		cccmd := strings.TrimSpace(string(cccmdb))
+		var cflags, ldflags []byte
+		if runtime.GOOS != "windows" {
+			fmt.Printf("%v-config --cflags\n", vm)
+			cmd = exec.Command(vm+"-config", "--cflags") // TODO: need minor version!
+			cflags, err = cmd.CombinedOutput()
+			if err != nil {
+				fmt.Printf("cmd had error: %v  output:\n%v\n", err, string(cflags))
+				return err
+			}
 
-		fmt.Printf("%v-config --cflags\n", vm)
-		cmd = exec.Command(vm+"-config", "--cflags") // TODO: need minor version!
-		cflags, err := cmd.CombinedOutput()
-		if err != nil {
-			fmt.Printf("cmd had error: %v  output:\n%v\n", err, string(cflags))
-			return err
+			fmt.Printf("%v-config --ldflags\n", vm)
+			cmd = exec.Command(vm+"-config", "--ldflags")
+			ldflags, err = cmd.CombinedOutput()
+			if err != nil {
+				fmt.Printf("cmd had error: %v  output:\n%v\n", err, string(ldflags))
+				return err
+			}
 		}
-
-		fmt.Printf("%v-config --ldflags\n", vm)
-		cmd = exec.Command(vm+"-config", "--ldflags")
-		ldflags, err := cmd.CombinedOutput()
-		if err != nil {
-			fmt.Printf("cmd had error: %v  output:\n%v\n", err, string(ldflags))
-			return err
+		extext := libExt
+		if runtime.GOOS == "windows" {
+			extext = ".pyd"
 		}
-
-		modlib := "_" + outname + libExt
+		modlib := "_" + outname + extext
 		gccargs := []string{outname + ".c", extraGccArgs, outname + "_go" + libExt, "-o", modlib}
 		gccargs = append(gccargs, strings.Split(strings.TrimSpace(string(cflags)), " ")...)
 		gccargs = append(gccargs, strings.Split(strings.TrimSpace(string(ldflags)), " ")...)
-		gccargs = append(gccargs, "-fPIC", "--shared")
+		gccargs = append(gccargs, "-fPIC", "--shared", "-Ofast")
+		if !symbols {
+			gccargs = append(gccargs, "-s")
+		}
+		include, exists := os.LookupEnv("GOPY_INCLUDE")
+		if exists {
+			gccargs = append(gccargs, "-I"+filepath.ToSlash(include))
+		}
+		lib, exists := os.LookupEnv("GOPY_LIBDIR")
+		if exists {
+			gccargs = append(gccargs, "-L"+filepath.ToSlash(lib))
+		}
+		libname, exists := os.LookupEnv("GOPY_PYLIB")
+		if exists {
+			gccargs = append(gccargs, "-l"+filepath.ToSlash(libname))
+		}
 
 		gccargs = func(vs []string) []string {
 			o := make([]string, 0, len(gccargs))