diff options
| author | qiulaidongfeng <2645477756@qq.com> | 2025-09-14 02:32:24 +0800 |
|---|---|---|
| committer | Michael Matloob <matloob@golang.org> | 2025-09-16 12:23:37 -0700 |
| commit | c2d85eb999fcd428a1cd71ed93805cbde0c16eaa (patch) | |
| tree | 09e82a4659458f63fe36fddcebdfc0d7363c84df | |
| parent | ac82fe68aaec797a9677171b00241fba57f057bc (diff) | |
| download | go-c2d85eb999fcd428a1cd71ed93805cbde0c16eaa.tar.xz | |
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 <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Michael Matloob <matloob@golang.org>
Reviewed-by: Michael Matloob <matloob@google.com>
Reviewed-by: Ian Alexander <jitsu@google.com>
Reviewed-by: Sean Liao <sean@liao.dev>
| -rw-r--r-- | src/cmd/go/internal/cfg/cfg.go | 3 |
1 files changed, 2 insertions, 1 deletions
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 |