Revert "tool/gocross: disable Linux static linking if GOCROSS_STATIC=0"

This reverts commit 2c0f0ee759.

Fixed by efac2cb8d6

Updates tailscale/corp#15058
Updates tailscale/corp#13113
This commit is contained in:
Brad Fitzpatrick 2023-10-03 18:53:15 -07:00 committed by Brad Fitzpatrick
parent 3655fb3ba0
commit 730cdfc1f7

View File

@ -6,7 +6,6 @@
import ( import (
"fmt" "fmt"
"runtime" "runtime"
"strconv"
"strings" "strings"
"tailscale.com/version/mkversion" "tailscale.com/version/mkversion"
@ -63,9 +62,6 @@ func autoflagsForTest(argv []string, env *Environment, goroot, nativeGOOS, nativ
switch targetOS { switch targetOS {
case "linux": case "linux":
if v, _ := strconv.ParseBool(env.Get("GOCROSS_STATIC", "1")); !v {
break
}
// Getting Go to build a static binary with cgo enabled is a // Getting Go to build a static binary with cgo enabled is a
// minor ordeal. The incantations you apparently need are // minor ordeal. The incantations you apparently need are
// documented at: https://github.com/golang/go/issues/26492 // documented at: https://github.com/golang/go/issues/26492