internal/rosa: stage3 special case helper
All checks were successful
Test / Create distribution (push) Successful in 49s
Test / Sandbox (push) Successful in 2m42s
Test / Hakurei (push) Successful in 3m48s
Test / ShareFS (push) Successful in 3m58s
Test / Hpkg (push) Successful in 4m30s
Test / Sandbox (race detector) (push) Successful in 5m1s
Test / Hakurei (race detector) (push) Successful in 5m54s
Test / Flake checks (push) Successful in 1m40s

This makes it cleaner to specify non-stage3 and stage3-exclusive dependencies.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
2026-01-24 11:48:19 +09:00
parent acee0b3632
commit d9ebaf20f8
6 changed files with 56 additions and 69 deletions

View File

@@ -81,14 +81,6 @@ func (t Toolchain) NewViaCMake(
panic("CACHE must be non-empty")
}
cmakeExtras := []pkg.Artifact{
t.NewCMake(),
t.NewNinja(),
}
if t == toolchainStage3 {
cmakeExtras = nil
}
scriptEarly := attr.ScriptEarly
if attr.Writable {
scriptEarly = `
@@ -102,9 +94,9 @@ chmod -R +w "${ROSA_SOURCE}"
}
sourcePath := AbsUsrSrc.Append(name)
return t.New(name+"-"+variant+"-"+version, slices.Concat(
attr.Extra,
cmakeExtras,
return t.New(name+"-"+variant+"-"+version, stage3Concat(t, attr.Extra,
t.NewCMake(),
t.NewNinja(),
), nil, slices.Concat([]string{
"ROSA_SOURCE=" + sourcePath.String(),
"ROSA_CMAKE_SOURCE=" + sourcePath.Append(attr.Append...).String(),