Skip to content

Commit 51dc5bf

Browse files
matloobgopherbot
authored andcommitted
Revert "cmd/go: disable cgo by default if CC unset and DefaultCC doesn't exist"
This reverts commit c2d85eb. 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 <[email protected]> Reviewed-by: Michael Matloob <[email protected]> Reviewed-by: Michael Matloob <[email protected]> Reviewed-by: Ian Alexander <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
1 parent ee7bf06 commit 51dc5bf

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

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

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

0 commit comments

Comments
 (0)