internal/rosa: improve cmake interface
All checks were successful
Test / Create distribution (push) Successful in 1m0s
Test / Sandbox (push) Successful in 2m38s
Test / Hakurei (push) Successful in 3m52s
Test / ShareFS (push) Successful in 4m0s
Test / Hpkg (push) Successful in 4m49s
Test / Sandbox (race detector) (push) Successful in 5m6s
Test / Hakurei (race detector) (push) Successful in 5m56s
Test / Flake checks (push) Successful in 1m42s

This should make the call site look better for new artifacts.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
2026-01-31 02:42:01 +09:00
parent 1ac8ca7a80
commit 47490823be
2 changed files with 19 additions and 26 deletions

View File

@@ -180,18 +180,6 @@ cp -r /system/include /usr/include && rm -rf /system/include
), &CMakeAttr{
Cache: slices.Concat(cache, attr.cmake),
Append: cmakeAppend,
Extra: stage3Concat(t, attr.extra,
t.Load(Libffi),
t.Load(Python),
t.Load(Perl),
t.Load(Diffutils),
t.Load(Bash),
t.Load(Gawk),
t.Load(Coreutils),
t.Load(Findutils),
t.Load(KernelHeaders),
),
Prefix: attr.prefix,
Env: slices.Concat([]string{
@@ -200,8 +188,19 @@ cp -r /system/include /usr/include && rm -rf /system/include
}, attr.env),
ScriptEarly: scriptEarly, Script: script + attr.script,
Exclusive: true,
})
Flag: TExclusive,
}, stage3Concat(t, attr.extra,
t.Load(Libffi),
t.Load(Python),
t.Load(Perl),
t.Load(Diffutils),
t.Load(Bash),
t.Load(Gawk),
t.Load(Coreutils),
t.Load(Findutils),
t.Load(KernelHeaders),
)...)
}
// newLLVM returns LLVM toolchain across multiple [pkg.Artifact].