From 6d0beaedaff9be18c3d4d51729f10e23a25f1e4e Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Fri, 3 Mar 2023 11:04:12 -0500 Subject: [PATCH] [v9.4.x] build: fix corss build (#63261) build: fix corss build (#61121) * build: fix corss build * fix lint (cherry picked from commit 37baae3699fcad37dac87a759491ae5db02369df) Co-authored-by: Jimmie Han --- pkg/build/cmd.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/build/cmd.go b/pkg/build/cmd.go index 2476caf2d42..93de968f7b4 100644 --- a/pkg/build/cmd.go +++ b/pkg/build/cmd.go @@ -146,6 +146,11 @@ func setup(goos string) { func doBuild(binaryName, pkg string, opts BuildOpts) error { log.Println("building", binaryName, pkg) + + if err := setBuildEnv(opts); err != nil { + return err + } + libcPart := "" if opts.libc != "" { libcPart = fmt.Sprintf("-%s", opts.libc) @@ -194,9 +199,6 @@ func doBuild(binaryName, pkg string, opts BuildOpts) error { return nil } - if err := setBuildEnv(opts); err != nil { - return err - } runPrint("go", "version") libcPart = "" if opts.libc != "" {