Move cgoEnabled out of importer/

cmd/gb/gb_test.go

@@ -1430,7 +1430,6 @@ func main() { println("hello world") }
 	gb.cd(gb.tempdir)
 	tmpdir := gb.tempDir("tmp")
 	gb.setenv("TMP", tmpdir)
-	gb.setenv("DEBUG", ".")
 	gb.run("build")
 	gb.mustBeEmpty(tmpdir)
 	name := "hello"

context.go

@@ -18,17 +18,13 @@ import (
 	"github.com/constabulary/gb/importer"
 )
 
-// Importer resolves the import path to a package.
-type Importer interface {
-	Import(path string) (*importer.Package, error)
-}
-
 // Context represents an execution of one or more Targets inside a Project.
 type Context struct {
 	*Project
 
-	*importer.Context
-	importers []Importer
+	importers []interface {
+		Import(path string) (*importer.Package, error)
+	}
 
 	pkgs map[string]*Package // map of package paths to resolved packages
 
@@ -161,15 +157,18 @@ func (p *Project) NewContext(opts ...func(*Context) error) (*Context, error) {
 	ic := importer.Context{
 		GOOS:        ctx.gotargetos,
 		GOARCH:      ctx.gotargetarch,
-		CgoEnabled:  cgoEnabled, // TODO(dfc)
+		CgoEnabled:  cgoEnabled(ctx.gohostos, ctx.gohostarch, ctx.gotargetos, ctx.gotargetarch),
 		ReleaseTags: releaseTags,
 		BuildTags:   ctx.buildtags,
 	}
+
 	ctx.importers = append(ctx.importers,
 		&importer.Importer{
 			Context: &ic,
 			Root:    runtime.GOROOT(),
-		})
+		},
+	)
+
 	for _, dir := range p.Srcdirs() {
 		ctx.importers = append(ctx.importers,
 			&importer.Importer{
@@ -178,8 +177,6 @@ func (p *Project) NewContext(opts ...func(*Context) error) (*Context, error) {
 			})
 	}
 
-	ctx.Context = &ic
-
 	// C and unsafe are fake packages synthesised by the compiler.
 	// Insert fake packages into the package cache.
 	for _, name := range []string{"C", "unsafe"} {
@@ -510,3 +507,39 @@ NextVar:
 	}
 	return out
 }
+
+func cgoEnabled(gohostos, gohostarch, gotargetos, gotargetarch string) bool {
+	switch os.Getenv("CGO_ENABLED") {
+	case "1":
+		return true
+	case "0":
+		return false
+	default:
+		// cgo must be explicitly enabled for cross compilation builds
+		if gohostos == gotargetos && gohostarch == gotargetarch {
+			switch gotargetos + "/" + gotargetarch {
+			case "darwin/386", "darwin/amd64", "darwin/arm", "darwin/arm64":
+				return true
+			case "dragonfly/amd64":
+				return true
+			case "freebsd/386", "freebsd/amd64", "freebsd/arm":
+				return true
+			case "linux/386", "linux/amd64", "linux/arm", "linux/arm64", "linux/ppc64le":
+				return true
+			case "android/386", "android/amd64", "android/arm":
+				return true
+			case "netbsd/386", "netbsd/amd64", "netbsd/arm":
+				return true
+			case "openbsd/386", "openbsd/amd64":
+				return true
+			case "solaris/amd64":
+				return true
+			case "windows/386", "windows/amd64":
+				return true
+			default:
+				return false
+			}
+		}
+		return false
+	}
+}

context_test.go

@@ -189,3 +189,22 @@ func TestContextLoadPackage(t *testing.T) {
 		}
 	}
 }
+
+func TestCgoEnabled(t *testing.T) {
+	tests := []struct {
+		gohostos, gohostarch     string
+		gotargetos, gotargetarch string
+		want                     bool
+	}{{
+		"linux", "amd64", "linux", "amd64", true,
+	}, {
+		"linux", "amd64", "linux", "386", false,
+	}}
+
+	for _, tt := range tests {
+		got := cgoEnabled(tt.gohostos, tt.gohostarch, tt.gotargetos, tt.gotargetarch)
+		if got != tt.want {
+			t.Errorf("cgoEnabled(%q, %q, %q, %q): got %v, want %v", tt.gohostos, tt.gohostarch, tt.gotargetos, tt.gotargetarch, got, tt.want)
+		}
+	}
+}

gb.go

@@ -11,7 +11,6 @@ import (
 )
 
 var releaseTags = build.Default.ReleaseTags
-var cgoEnabled = build.Default.CgoEnabled
 
 // Toolchain represents a standardised set of command line tools
 // used to build and test Go programs.

importer/pkg.go

@@ -368,42 +368,6 @@ func saveCgo(di *Package, filename string, cg *ast.CommentGroup) error {
 	return nil
 }
 
-func cgoEnabled(gohostos, gohostarch, gotargetos, gotargetarch string) bool {
-	switch os.Getenv("CGO_ENABLED") {
-	case "1":
-		return true
-	case "0":
-		return false
-	default:
-		// cgo must be explicitly enabled for cross compilation builds
-		if gohostos == gotargetos && gohostarch == gotargetarch {
-			switch gotargetos + "/" + gotargetarch {
-			case "darwin/386", "darwin/amd64", "darwin/arm", "darwin/arm64":
-				return true
-			case "dragonfly/amd64":
-				return true
-			case "freebsd/386", "freebsd/amd64", "freebsd/arm":
-				return true
-			case "linux/386", "linux/amd64", "linux/arm", "linux/arm64", "linux/ppc64le":
-				return true
-			case "android/386", "android/amd64", "android/arm":
-				return true
-			case "netbsd/386", "netbsd/amd64", "netbsd/arm":
-				return true
-			case "openbsd/386", "openbsd/amd64":
-				return true
-			case "solaris/amd64":
-				return true
-			case "windows/386", "windows/amd64":
-				return true
-			default:
-				return false
-			}
-		}
-		return false
-	}
-}
-
 func cleanImports(m map[string][]token.Position) ([]string, map[string][]token.Position) {
 	if len(m) == 0 {
 		return nil, nil

importer/pkg_test.go

@@ -93,22 +93,3 @@ func TestSplitQuoted(t *testing.T) {
 		}
 	}
 }
-
-func TestCgoEnabled(t *testing.T) {
-	tests := []struct {
-		gohostos, gohostarch     string
-		gotargetos, gotargetarch string
-		want                     bool
-	}{{
-		"linux", "amd64", "linux", "amd64", true,
-	}, {
-		"linux", "amd64", "linux", "386", false,
-	}}
-
-	for _, tt := range tests {
-		got := cgoEnabled(tt.gohostos, tt.gohostarch, tt.gotargetos, tt.gotargetarch)
-		if got != tt.want {
-			t.Errorf("cgoEnabled(%q, %q, %q, %q): got %v, want %v", tt.gohostos, tt.gohostarch, tt.gotargetos, tt.gotargetarch, got, tt.want)
-		}
-	}
-}