From b482fd4abfb2b3765b1791915b31067a0f80fec7 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Wed, 20 May 2026 08:07:43 +0900 Subject: internal/rosa: remove global handles These no longer serve any purpose. Signed-off-by: Ophestra --- internal/rosa/go.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'internal/rosa/go.go') diff --git a/internal/rosa/go.go b/internal/rosa/go.go index 2bde38c0..ef8a3a1c 100644 --- a/internal/rosa/go.go +++ b/internal/rosa/go.go @@ -6,11 +6,13 @@ import ( "hakurei.app/internal/pkg" ) +var _go = H("go") + // newGoBootstrap returns the Go bootstrap toolchain. func (t Toolchain) newGoBootstrap() pkg.Artifact { const checksum = "8o9JL_ToiQKadCTb04nvBDkp8O1xiWOolAxVEqaTGodieNe4lOFEjlOxN3bwwe23" return t.New("go1.4-bootstrap", 0, t.Append(nil, - Bash, + bash, ), nil, []string{ "CGO_ENABLED=0", }, ` @@ -39,7 +41,7 @@ func (t Toolchain) newGo( name = "make" } return t.New("go"+version, 0, t.Append(extra, - Bash, + bash, ), nil, slices.Concat([]string{ "CC=cc", "GOCACHE=/tmp/gocache", @@ -78,7 +80,7 @@ func (t Toolchain) newGoLatest() (pkg.Artifact, string) { case "arm64", "riscv64": bootstrapEnv = append(bootstrapEnv, "GOROOT_BOOTSTRAP=/system") - bootstrapExtra = t.Append(bootstrapExtra, gcc) + bootstrapExtra = t.Append(bootstrapExtra, H("gcc")) finalEnv = append(finalEnv, "CGO_ENABLED=0") default: -- cgit v1.3.1