Skip to content

Commit c2d85eb

Browse files
qiulaidongfengmatloob
authored andcommitted
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 <[email protected]> Reviewed-by: Michael Matloob <[email protected]> Reviewed-by: Michael Matloob <[email protected]> Reviewed-by: Ian Alexander <[email protected]> Reviewed-by: Sean Liao <[email protected]>
1 parent ac82fe6 commit c2d85eb

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/cmd/go/internal/cfg/cfg.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@ func defaultContext() build.Context {
145145
if buildcfg.DefaultCGO_ENABLED == "1" {
146146
defaultCgoEnabled = true
147147
} else if buildcfg.DefaultCGO_ENABLED == "0" {
148-
} else if runtime.GOARCH == ctxt.GOARCH && runtime.GOOS == ctxt.GOOS {
148+
}
149+
if runtime.GOARCH == ctxt.GOARCH && runtime.GOOS == ctxt.GOOS {
149150
defaultCgoEnabled = platform.CgoSupported(ctxt.GOOS, ctxt.GOARCH)
150151
// Use built-in default cgo setting for GOOS/GOARCH.
151152
// Note that ctxt.GOOS/GOARCH are derived from the preference list

0 commit comments

Comments
 (0)