From 51dc5bfe6c1e8e71065401f12cf000b9941882fd Mon Sep 17 00:00:00 2001 From: Michael Matloob Date: Fri, 19 Sep 2025 09:25:20 -0700 Subject: [PATCH] Revert "cmd/go: disable cgo by default if CC unset and DefaultCC doesn't exist" This reverts commit c2d85eb999fcd428a1cd71ed93805cbde0c16eaa. Reason for revert: change was incorrect. ignores setting of CGO_ENABLED in some cases Change-Id: I8e6e68dd600be5306a247a3314f4b57175f1aa56 Reviewed-on: https://go-review.googlesource.com/c/go/+/705495 Auto-Submit: Michael Matloob Reviewed-by: Michael Matloob Reviewed-by: Michael Matloob Reviewed-by: Ian Alexander LUCI-TryBot-Result: Go LUCI --- src/cmd/go/internal/cfg/cfg.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go index 97e4eeeff3..a4edd854f1 100644 --- a/src/cmd/go/internal/cfg/cfg.go +++ b/src/cmd/go/internal/cfg/cfg.go @@ -145,8 +145,7 @@ func defaultContext() build.Context { if buildcfg.DefaultCGO_ENABLED == "1" { defaultCgoEnabled = true } else if buildcfg.DefaultCGO_ENABLED == "0" { - } - if runtime.GOARCH == ctxt.GOARCH && runtime.GOOS == ctxt.GOOS { + } else if runtime.GOARCH == ctxt.GOARCH && runtime.GOOS == ctxt.GOOS { defaultCgoEnabled = platform.CgoSupported(ctxt.GOOS, ctxt.GOARCH) // Use built-in default cgo setting for GOOS/GOARCH. // Note that ctxt.GOOS/GOARCH are derived from the preference list -- 2.52.0