From 485de9cd8c260417a1e9cfdfb79a56a783e38563 Mon Sep 17 00:00:00 2001
From: Guillaume Ballet <3272758+gballet@users.noreply.github.com>
Date: Wed, 17 Sep 2025 15:09:23 +0200
Subject: [PATCH] more noiceties

---
 build/ci.go | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/build/ci.go b/build/ci.go
index c9fe80549a..dbc53b1b7d 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -237,9 +237,6 @@ func doInstall(cmdline []string) {
 	// Configure the build.
 	gobuild := tc.Go("build", buildFlags(env, *staticlink, buildTags)...)
 
-	// We use -trimpath to avoid leaking local paths into the built executables.
-	gobuild.Args = append(gobuild.Args, "-trimpath")
-
 	// Show packages during build.
 	gobuild.Args = append(gobuild.Args, "-v")
 
@@ -266,18 +263,22 @@ func doInstallKeeper(cmdline []string) {
 	flag.CommandLine.Parse(cmdline)
 	env := build.Env()
 
+	// Configure the toolchain.
+	tc := build.GoToolchain{}
+	if *dlgo {
+		csdb := download.MustLoadChecksums("build/checksums.txt")
+		tc.Root = build.DownloadGo(csdb)
+	}
+
 	for _, target := range keeperTargets {
-		log.Printf("Building keeper for %s/%s (tags: %s)", target.GOOS, target.GOARCH, target.Tags)
-
-		// Configure the toolchain.
-		tc := build.GoToolchain{GOARCH: target.GOARCH, GOOS: target.GOOS, CC: target.CC}
-		if *dlgo {
-			csdb := download.MustLoadChecksums("build/checksums.txt")
-			tc.Root = build.DownloadGo(csdb)
-		}
+		log.Printf("Building keeper-%s", target.Name)
 
+		// Configure the build.
+		tc.GOARCH = target.GOARCH
+		tc.GOOS = target.GOOS
+		tc.CC = target.CC
 		gobuild := tc.Go("build", buildFlags(env, true, []string{target.Tags})...)
-		gobuild.Args = append(gobuild.Args, "-trimpath", "-v")
+		gobuild.Args = append(gobuild.Args, "-v")
 
 		for key, value := range target.Env {
 			gobuild.Env = append(gobuild.Env, key+"="+value)
@@ -329,6 +330,8 @@ func buildFlags(env build.Environment, staticLinking bool, buildTags []string) (
 	if len(buildTags) > 0 {
 		flags = append(flags, "-tags", strings.Join(buildTags, ","))
 	}
+	// We use -trimpath to avoid leaking local paths into the built executables.
+	flags = append(flags, "-trimpath")
 	return flags
 }