diff options
| author | Bryan C. Mills <bcmills@google.com> | 2023-04-11 14:27:45 +0000 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2023-04-20 17:26:46 +0000 |
| commit | d22f287f12f4782082cd93785ad91e78dbe0d4d6 (patch) | |
| tree | fe20635700fb7a754d79c828127915b577ad708d /src/cmd/objdump | |
| parent | 0d699b6cb3e6be63846bbbee8cc7bcbfd6cb9500 (diff) | |
| download | go-d22f287f12f4782082cd93785ad91e78dbe0d4d6.tar.xz | |
cmd/dist: refactor generated cgo-support logic
During bootstrapping, cmd/dist writes a file indicating which
GOOS/GOARCH combinations are valid, and which support cgo-enabled
builds. That information previously went into the go/build package,
but today it fits in more naturally in the internal/platform package
(which already has a number of functions indicating feature support
for GOOS/GOARCH combinations).
Moreover, as of CL 450739 the cmd/go logic for determining whether to
use cgo is somewhat more nuanced than the go/build logic: cmd/go
checks for the presence of a C compiler, whereas go/build does not
(mostly because it determines its configuration at package-init time,
and checking $PATH for a C compiler is somewhat expensive).
To simplify this situation, this change:
- consolidates the “cgo supported” check in internal/platform
(alongside many other platform-support checks) instead of making
it a one-off in go/build,
- and updates a couple of tests to use testenv.HasCGO instead of
build.Default.CgoEnabled to decide whether to test a cgo-specific
behavior.
For #58884.
For #59500.
Change-Id: I0bb2502dba4545a3d98c9e915727382ce536a0f3
Reviewed-on: https://go-review.googlesource.com/c/go/+/483695
Auto-Submit: Bryan Mills <bcmills@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Bryan Mills <bcmills@google.com>
Diffstat (limited to 'src/cmd/objdump')
| -rw-r--r-- | src/cmd/objdump/objdump_test.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/cmd/objdump/objdump_test.go b/src/cmd/objdump/objdump_test.go index 3abfb1461c..6e781c924d 100644 --- a/src/cmd/objdump/objdump_test.go +++ b/src/cmd/objdump/objdump_test.go @@ -8,7 +8,6 @@ import ( "cmd/internal/notsha256" "flag" "fmt" - "go/build" "internal/platform" "internal/testenv" "os" @@ -253,7 +252,7 @@ func testDisasm(t *testing.T, srcfname string, printCode bool, printGnuAsm bool, func testGoAndCgoDisasm(t *testing.T, printCode bool, printGnuAsm bool) { t.Parallel() testDisasm(t, "fmthello.go", printCode, printGnuAsm) - if build.Default.CgoEnabled { + if testenv.HasCGO() { testDisasm(t, "fmthellocgo.go", printCode, printGnuAsm) } } |