From 47490823be4d81643ed3895263feec1da64f751e Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sat, 31 Jan 2026 02:42:01 +0900 Subject: internal/rosa: improve cmake interface This should make the call site look better for new artifacts. Signed-off-by: Ophestra --- internal/rosa/llvm.go | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'internal/rosa/llvm.go') diff --git a/internal/rosa/llvm.go b/internal/rosa/llvm.go index e86050f8..101258bf 100644 --- a/internal/rosa/llvm.go +++ b/internal/rosa/llvm.go @@ -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]. -- cgit v1.3.1