From c2d85eb999fcd428a1cd71ed93805cbde0c16eaa Mon Sep 17 00:00:00 2001 From: qiulaidongfeng <2645477756@qq.com> Date: Sun, 14 Sep 2025 02:32:24 +0800 Subject: [PATCH] cmd/go: disable cgo by default if CC unset and DefaultCC doesn't exist CL 621995 disrupted the behavior introduced by CL 450739, now restore it. Fixes #75340 Change-Id: Icd1a0eb970876995f9446e0547ceb9e78990f6ed Reviewed-on: https://go-review.googlesource.com/c/go/+/703555 LUCI-TryBot-Result: Go LUCI Reviewed-by: Michael Matloob Reviewed-by: Michael Matloob Reviewed-by: Ian Alexander Reviewed-by: Sean Liao --- src/cmd/go/internal/cfg/cfg.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go index a4edd854f1..97e4eeeff3 100644 --- a/src/cmd/go/internal/cfg/cfg.go +++ b/src/cmd/go/internal/cfg/cfg.go @@ -145,7 +145,8 @@ func defaultContext() build.Context { if buildcfg.DefaultCGO_ENABLED == "1" { defaultCgoEnabled = true } else if buildcfg.DefaultCGO_ENABLED == "0" { - } else if runtime.GOARCH == ctxt.GOARCH && runtime.GOOS == ctxt.GOOS { + } + 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