diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-02-22 15:53:41 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-02-22 15:53:41 +0900 |
| commit | 5e4bf23e0cd4b57b1b0c9bbcec23baf5718d8011 (patch) | |
| tree | 300b0736a1f6841aea8cae124e82de8352222833 /internal/rosa/llvm.go | |
| parent | d4519e2075ed486bf5e65edf0f047f541ddd422f (diff) | |
internal/rosa/musl: migrate to make helper
This is much cleaner and eliminates the early ugliness.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/rosa/llvm.go')
| -rw-r--r-- | internal/rosa/llvm.go | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/internal/rosa/llvm.go b/internal/rosa/llvm.go index 5bb95051..d0e0ac73 100644 --- a/internal/rosa/llvm.go +++ b/internal/rosa/llvm.go @@ -246,11 +246,8 @@ func (t Toolchain) newLLVM() (musl, compilerRT, runtimes, clang pkg.Artifact) { {"COMPILER_RT_BUILD_XRAY", "OFF"}, }, append: []string{"compiler-rt"}, - extra: []pkg.Artifact{t.NewMusl(&MuslAttr{ - Headers: true, - Env: []string{ - "CC=clang", - }, + extra: []pkg.Artifact{t.newMusl(true, []string{ + "CC=clang", })}, script: ` mkdir -p "${ROSA_INSTALL_PREFIX}/lib/clang/21/lib/" @@ -267,18 +264,15 @@ ln -s \ `, }) - musl = t.NewMusl(&MuslAttr{ - Extra: []pkg.Artifact{compilerRT}, - Env: stage0ExclConcat(t, []string{ - "CC=clang", - "LIBCC=/system/lib/clang/21/lib/" + - triplet() + "/libclang_rt.builtins.a", - "AR=ar", - "RANLIB=ranlib", - }, - "LDFLAGS="+earlyLDFLAGS(false), - ), - }) + musl = t.newMusl(false, stage0ExclConcat(t, []string{ + "CC=clang", + "LIBCC=/system/lib/clang/21/lib/" + + triplet() + "/libclang_rt.builtins.a", + "AR=ar", + "RANLIB=ranlib", + }, + "LDFLAGS="+earlyLDFLAGS(false), + ), compilerRT) runtimes = t.newLLVMVariant("runtimes", &llvmAttr{ env: stage0ExclConcat(t, []string{}, |