From 9dcc873413aa390bd9392d1ed6ae4198593e4c5d Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Fri, 21 Oct 2022 15:43:54 -0400 Subject: [PATCH] cmd/dist: simplify cgo_test Now that misc/cgo/test doesn't invoke any Go builds itself, we don't need to use GOFLAGS to thread build flags down into sub-builds. Preparation for #37486. Change-Id: I9ecdd215da5c21339cbf76765f8be2190d19539c Reviewed-on: https://go-review.googlesource.com/c/go/+/447356 Reviewed-by: Than McIntosh TryBot-Result: Gopher Robot Reviewed-by: Bryan Mills Run-TryBot: Austin Clements --- src/cmd/dist/test.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go index 66ebdf92bf..9670ef447f 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go @@ -1170,16 +1170,14 @@ func (t *tester) runHostTest(dir, pkg string) error { } func (t *tester) cgoTest(dt *distTest) error { - cmd := t.addCmd(dt, "misc/cgo/test", t.goTest(), ".") - setEnv(cmd, "GOFLAGS", "-ldflags=-linkmode=auto") + t.addCmd(dt, "misc/cgo/test", t.goTest(), "-ldflags=-linkmode=auto", ".") // Stub out various buildmode=pie tests on alpine until 54354 resolved. builderName := os.Getenv("GO_BUILDER_NAME") disablePIE := strings.HasSuffix(builderName, "-alpine") if t.internalLink() { - cmd := t.addCmd(dt, "misc/cgo/test", t.goTest(), "-tags=internal", ".") - setEnv(cmd, "GOFLAGS", "-ldflags=-linkmode=internal") + t.addCmd(dt, "misc/cgo/test", t.goTest(), "-ldflags=-linkmode=internal", "-tags=internal", ".") } pair := gohostos + "-" + goarch @@ -1190,8 +1188,7 @@ func (t *tester) cgoTest(dt *distTest) error { if !t.extLink() { break } - cmd := t.addCmd(dt, "misc/cgo/test", t.goTest(), ".") - setEnv(cmd, "GOFLAGS", "-ldflags=-linkmode=external") + t.addCmd(dt, "misc/cgo/test", t.goTest(), "-ldflags=-linkmode=external", ".") t.addCmd(dt, "misc/cgo/test", t.goTest(), "-ldflags", "-linkmode=external -s", ".") @@ -1211,8 +1208,7 @@ func (t *tester) cgoTest(dt *distTest) error { "netbsd-386", "netbsd-amd64", "openbsd-386", "openbsd-amd64", "openbsd-arm", "openbsd-arm64", "openbsd-mips64": - cmd := t.addCmd(dt, "misc/cgo/test", t.goTest(), ".") - setEnv(cmd, "GOFLAGS", "-ldflags=-linkmode=external") + cmd := t.addCmd(dt, "misc/cgo/test", t.goTest(), "-ldflags=-linkmode=external", ".") // cgo should be able to cope with both -g arguments and colored // diagnostics. setEnv(cmd, "CGO_CFLAGS", "-g0 -fdiagnostics-color") -- 2.50.0