internal/rosa/llvm: separate major version
All checks were successful
Test / Create distribution (push) Successful in 2m25s
Test / ShareFS (push) Successful in 7m56s
Test / Hakurei (race detector) (push) Successful in 10m6s
Test / Hakurei (push) Successful in 2m36s
Test / Sandbox (push) Successful in 1m30s
Test / Sandbox (race detector) (push) Successful in 2m17s
Test / Flake checks (push) Successful in 1m30s
All checks were successful
Test / Create distribution (push) Successful in 2m25s
Test / ShareFS (push) Successful in 7m56s
Test / Hakurei (race detector) (push) Successful in 10m6s
Test / Hakurei (push) Successful in 2m36s
Test / Sandbox (push) Successful in 1m30s
Test / Sandbox (race detector) (push) Successful in 2m17s
Test / Flake checks (push) Successful in 1m30s
For pathname formatting at compile time. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -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.
|
// newLLVMVariant returns a [pkg.Artifact] containing a LLVM variant.
|
||||||
func (t Toolchain) newLLVMVariant(variant string, attr *llvmAttr) pkg.Artifact {
|
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,
|
muslHeaders,
|
||||||
},
|
},
|
||||||
script: `
|
script: `
|
||||||
mkdir -p "/work/system/lib/clang/21/lib/"
|
mkdir -p "/work/system/lib/clang/` + llvmVersionMajor + `/lib/"
|
||||||
ln -s \
|
ln -s \
|
||||||
"../../../${ROSA_TRIPLE}" \
|
"../../../${ROSA_TRIPLE}" \
|
||||||
"/work/system/lib/clang/21/lib/"
|
"/work/system/lib/clang/` + llvmVersionMajor + `/lib/"
|
||||||
|
|
||||||
ln -s \
|
ln -s \
|
||||||
"clang_rt.crtbegin-` + linuxArch() + `.o" \
|
"clang_rt.crtbegin-` + linuxArch() + `.o" \
|
||||||
@@ -261,7 +264,7 @@ ln -s \
|
|||||||
|
|
||||||
musl, _ = t.newMusl(false, stage0ExclConcat(t, []string{
|
musl, _ = t.newMusl(false, stage0ExclConcat(t, []string{
|
||||||
"CC=clang",
|
"CC=clang",
|
||||||
"LIBCC=/system/lib/clang/21/lib/" +
|
"LIBCC=/system/lib/clang/" + llvmVersionMajor + "/lib/" +
|
||||||
triplet() + "/libclang_rt.builtins.a",
|
triplet() + "/libclang_rt.builtins.a",
|
||||||
"AR=ar",
|
"AR=ar",
|
||||||
"RANLIB=ranlib",
|
"RANLIB=ranlib",
|
||||||
|
|||||||
@@ -329,7 +329,7 @@ mkdir -vp /work/system/bin
|
|||||||
|
|
||||||
"AR=ar",
|
"AR=ar",
|
||||||
"RANLIB=ranlib",
|
"RANLIB=ranlib",
|
||||||
"LIBCC=/system/lib/clang/21/lib/" + triplet() +
|
"LIBCC=/system/lib/clang/" + llvmVersionMajor + "/lib/" + triplet() +
|
||||||
"/libclang_rt.builtins.a",
|
"/libclang_rt.builtins.a",
|
||||||
}, "/system/bin", "/bin")
|
}, "/system/bin", "/bin")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user