Set GOAMD64 if variant is set (ko-build#578)

This change also changes behavior of GOARM, since docs suggest that it's only used when the GOARCH=arm, and not arm64.
cpanato · Feb 1, 2022 · e961890 · e961890
1 parent 64fa5ed
commit e961890
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 55 deletions.
diff --git a/pkg/build/gobuild.go b/pkg/build/gobuild.go
@@ -335,14 +335,20 @@ func buildEnv(platform v1.Platform, userEnv, configEnv []string) ([]string, erro
 		"GOOS=" + platform.OS,
 		"GOARCH=" + platform.Architecture,
 	}
-
-	if strings.HasPrefix(platform.Architecture, "arm") && platform.Variant != "" {
-		goarm, err := getGoarm(platform)
-		if err != nil {
-			return nil, fmt.Errorf("goarm failure: %w", err)
-		}
-		if goarm != "" {
-			env = append(env, "GOARM="+goarm)
+	if platform.Variant != "" {
+		switch platform.Architecture {
+		case "arm":
+			// See: https://pkg.go.dev/cmd/go#hdr-Environment_variables
+			goarm, err := getGoarm(platform)
+			if err != nil {
+				return nil, fmt.Errorf("goarm failure: %w", err)
+			}
+			if goarm != "" {
+				env = append(env, "GOARM="+goarm)
+			}
+		case "amd64":
+			// See: https://tip.golang.org/doc/go1.18#amd64
+			env = append(env, "GOAMD64="+platform.Variant)
 		}
 	}
 

diff --git a/pkg/build/gobuild_test.go b/pkg/build/gobuild_test.go
@@ -221,58 +221,63 @@ func TestBuildEnv(t *testing.T) {
 		userEnv      []string
 		configEnv    []string
 		expectedEnvs map[string]string
-	}{
-		{
-			description: "defaults",
-			platform: v1.Platform{
-				OS:           "linux",
-				Architecture: "amd64",
-			},
-			expectedEnvs: map[string]string{
-				"GOOS":        "linux",
-				"GOARCH":      "amd64",
-				"CGO_ENABLED": "0",
-			},
+	}{{
+		description: "defaults",
+		platform: v1.Platform{
+			OS:           "linux",
+			Architecture: "amd64",
 		},
-		{
-			description: "override a default value",
-			configEnv:   []string{"CGO_ENABLED=1"},
-			expectedEnvs: map[string]string{
-				"CGO_ENABLED": "1",
-			},
+		expectedEnvs: map[string]string{
+			"GOOS":        "linux",
+			"GOARCH":      "amd64",
+			"CGO_ENABLED": "0",
 		},
-		{
-			description: "override an envvar and add an envvar",
-			userEnv:     []string{"CGO_ENABLED=0"},
-			configEnv:   []string{"CGO_ENABLED=1", "GOPRIVATE=git.internal.example.com,source.developers.google.com"},
-			expectedEnvs: map[string]string{
-				"CGO_ENABLED": "1",
-				"GOPRIVATE":   "git.internal.example.com,source.developers.google.com",
-			},
+	}, {
+		description: "override a default value",
+		configEnv:   []string{"CGO_ENABLED=1"},
+		expectedEnvs: map[string]string{
+			"CGO_ENABLED": "1",
 		},
-		{
-			description: "arm variant",
-			platform: v1.Platform{
-				Architecture: "arm",
-				Variant:      "v7",
-			},
-			expectedEnvs: map[string]string{
-				"GOARCH": "arm",
-				"GOARM":  "7",
-			},
+	}, {
+		description: "override an envvar and add an envvar",
+		userEnv:     []string{"CGO_ENABLED=0"},
+		configEnv:   []string{"CGO_ENABLED=1", "GOPRIVATE=git.internal.example.com,source.developers.google.com"},
+		expectedEnvs: map[string]string{
+			"CGO_ENABLED": "1",
+			"GOPRIVATE":   "git.internal.example.com,source.developers.google.com",
 		},
-		{
-			description: "arm64 variant",
-			platform: v1.Platform{
-				Architecture: "arm64",
-				Variant:      "v8",
-			},
-			expectedEnvs: map[string]string{
-				"GOARCH": "arm64",
-				"GOARM":  "7",
-			},
+	}, {
+		description: "arm variant",
+		platform: v1.Platform{
+			Architecture: "arm",
+			Variant:      "v7",
 		},
-	}
+		expectedEnvs: map[string]string{
+			"GOARCH": "arm",
+			"GOARM":  "7",
+		},
+	}, {
+		// GOARM is ignored for arm64.
+		description: "arm64 variant",
+		platform: v1.Platform{
+			Architecture: "arm64",
+			Variant:      "v8",
+		},
+		expectedEnvs: map[string]string{
+			"GOARCH": "arm64",
+			"GOARM":  "",
+		},
+	}, {
+		description: "amd64 variant",
+		platform: v1.Platform{
+			Architecture: "amd64",
+			Variant:      "v3",
+		},
+		expectedEnvs: map[string]string{
+			"GOARCH":  "amd64",
+			"GOAMD64": "v3",
+		},
+	}}
 	for _, test := range tests {
 		t.Run(test.description, func(t *testing.T) {
 			env, err := buildEnv(test.platform, test.userEnv, test.configEnv)