diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-03-05 22:59:51 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-03-05 22:59:51 +0900 |
| commit | 9c9befb4c9730175c8ecf7d281f72aa697cb10f1 (patch) | |
| tree | 12f2dcc02851f0871beabaa5eab3c33ec6a015ea | |
| parent | fcdf9ecee4477fae3150806cdf2231c83d2720e8 (diff) | |
internal/rosa/llvm: separate major version
For pathname formatting at compile time.
Signed-off-by: Ophestra <cat@gensokyo.uk>
| -rw-r--r-- | internal/rosa/llvm.go | 11 | ||||
| -rw-r--r-- | internal/rosa/rosa.go | 2 |
2 files changed, 8 insertions, 5 deletions
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", diff --git a/internal/rosa/rosa.go b/internal/rosa/rosa.go index 7c0e3d39..fbdba172 100644 --- a/internal/rosa/rosa.go +++ b/internal/rosa/rosa.go @@ -329,7 +329,7 @@ mkdir -vp /work/system/bin "AR=ar", "RANLIB=ranlib", - "LIBCC=/system/lib/clang/21/lib/" + triplet() + + "LIBCC=/system/lib/clang/" + llvmVersionMajor + "/lib/" + triplet() + "/libclang_rt.builtins.a", }, "/system/bin", "/bin") |