diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-05-20 08:07:43 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-05-20 08:15:23 +0900 |
| commit | b482fd4abfb2b3765b1791915b31067a0f80fec7 (patch) | |
| tree | 1cb95592a7f243aa920e3f4c497909a2e8bf9efb /internal/rosa/go.go | |
| parent | 2e502ede6c885496f4ac0a480aa4e4e337c54f51 (diff) | |
internal/rosa: remove global handles
These no longer serve any purpose.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/rosa/go.go')
| -rw-r--r-- | internal/rosa/go.go | 8 |
1 files changed, 5 insertions, 3 deletions
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: |