From 9c9befb4c9730175c8ecf7d281f72aa697cb10f1 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Thu, 5 Mar 2026 22:59:51 +0900 Subject: internal/rosa/llvm: separate major version For pathname formatting at compile time. Signed-off-by: Ophestra --- internal/rosa/llvm.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'internal/rosa/llvm.go') diff --git a/internal/rosa/llvm.go b/internal/rosa/llvm.go index 1468f06b..6a9532d7 100644 --- a/internal/rosa/llvm.go +++ b/internal/rosa/llvm.go @@ -73,7 +73,10 @@ func llvmFlagName(flag int) string { } } -const llvmVersion = "22.1.0" +const ( + llvmVersionMajor = "22" + llvmVersion = llvmVersionMajor + ".1.0" +) // newLLVMVariant returns a [pkg.Artifact] containing a LLVM variant. func (t Toolchain) newLLVMVariant(variant string, attr *llvmAttr) pkg.Artifact { @@ -245,10 +248,10 @@ func (t Toolchain) newLLVM() (musl, compilerRT, runtimes, clang pkg.Artifact) { muslHeaders, }, script: ` -mkdir -p "/work/system/lib/clang/21/lib/" +mkdir -p "/work/system/lib/clang/` + llvmVersionMajor + `/lib/" ln -s \ "../../../${ROSA_TRIPLE}" \ - "/work/system/lib/clang/21/lib/" + "/work/system/lib/clang/` + llvmVersionMajor + `/lib/" ln -s \ "clang_rt.crtbegin-` + linuxArch() + `.o" \ @@ -261,7 +264,7 @@ ln -s \ musl, _ = t.newMusl(false, stage0ExclConcat(t, []string{ "CC=clang", - "LIBCC=/system/lib/clang/21/lib/" + + "LIBCC=/system/lib/clang/" + llvmVersionMajor + "/lib/" + triplet() + "/libclang_rt.builtins.a", "AR=ar", "RANLIB=ranlib", -- cgit v1.3.1