internal/rosa: name suffix by toolchain
All checks were successful
Test / Create distribution (push) Successful in 49s
Test / Sandbox (push) Successful in 2m35s
Test / Hakurei (push) Successful in 3m54s
Test / ShareFS (push) Successful in 3m57s
Test / Hpkg (push) Successful in 4m32s
Test / Sandbox (race detector) (push) Successful in 5m3s
Test / Hakurei (race detector) (push) Successful in 6m8s
Test / Flake checks (push) Successful in 1m44s

This makes output more useful during bootstrap.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
2026-01-26 00:57:03 +09:00
parent 3224a7da63
commit bb1b6beb87
2 changed files with 12 additions and 1 deletions

View File

@@ -98,7 +98,12 @@ func (a cureEtc) Dependencies() []pkg.Artifact {
} }
// String returns a hardcoded reporting name. // String returns a hardcoded reporting name.
func (cureEtc) String() string { return "cure-etc" } func (a cureEtc) String() string {
if a.iana == nil {
return "cure-etc-minimal"
}
return "cure-etc"
}
// newIANAEtc returns an unpacked iana-etc release. // newIANAEtc returns an unpacked iana-etc release.
func newIANAEtc() pkg.Artifact { func newIANAEtc() pkg.Artifact {

View File

@@ -192,10 +192,12 @@ func (t Toolchain) New(
) )
switch t { switch t {
case toolchainBusybox: case toolchainBusybox:
name += "-early"
support = slices.Concat([]pkg.Artifact{newBusyboxBin()}, extra) support = slices.Concat([]pkg.Artifact{newBusyboxBin()}, extra)
env = fixupEnviron(env, nil, "/system/bin") env = fixupEnviron(env, nil, "/system/bin")
case toolchainStage3: case toolchainStage3:
name += "-boot"
const ( const (
version = "20260111T160052Z" version = "20260111T160052Z"
checksum = "c5_FwMnRN8RZpTdBLGYkL4RR8ampdaZN2JbkgrFLe8-QHQAVQy08APVvIL6eT7KW" checksum = "c5_FwMnRN8RZpTdBLGYkL4RR8ampdaZN2JbkgrFLe8-QHQAVQy08APVvIL6eT7KW"
@@ -227,6 +229,10 @@ ln -vs ../usr/bin /work/bin
) )
case toolchainIntermediate, Std: case toolchainIntermediate, Std:
if t < Std {
name += "-std"
}
boot := t - 1 boot := t - 1
musl, compilerRT, runtimes, clang := boot.NewLLVM() musl, compilerRT, runtimes, clang := boot.NewLLVM()
support = slices.Concat(extra, []pkg.Artifact{ support = slices.Concat(extra, []pkg.Artifact{