internal/rosa/llvm: migrate compiler-rt helper
All checks were successful
Test / Create distribution (push) Successful in 1m16s
Test / Sandbox (push) Successful in 3m23s
Test / Hakurei (push) Successful in 4m29s
Test / ShareFS (push) Successful in 4m34s
Test / Sandbox (race detector) (push) Successful in 5m51s
Test / Hakurei (race detector) (push) Successful in 6m58s
Test / Flake checks (push) Successful in 1m26s
All checks were successful
Test / Create distribution (push) Successful in 1m16s
Test / Sandbox (push) Successful in 3m23s
Test / Hakurei (push) Successful in 4m29s
Test / ShareFS (push) Successful in 4m34s
Test / Sandbox (race detector) (push) Successful in 5m51s
Test / Hakurei (race detector) (push) Successful in 6m58s
Test / Flake checks (push) Successful in 1m26s
This also removes unused dependencies. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -70,11 +70,20 @@ func (t Toolchain) newLLVMVariant(variant string, attr *llvmAttr) pkg.Artifact {
|
|||||||
|
|
||||||
func (t Toolchain) newCompilerRT() (pkg.Artifact, string) {
|
func (t Toolchain) newCompilerRT() (pkg.Artifact, string) {
|
||||||
muslHeaders, _ := t.newMusl(true)
|
muslHeaders, _ := t.newMusl(true)
|
||||||
return t.newLLVMVariant("compiler-rt", &llvmAttr{
|
return t.NewPackage("llvm", llvmVersion, llvmSource, &PackageAttr{
|
||||||
env: stage0ExclConcat(t, []string{},
|
Patches: llvmPatches,
|
||||||
|
NonStage0: []pkg.Artifact{
|
||||||
|
muslHeaders,
|
||||||
|
},
|
||||||
|
Env: stage0ExclConcat(t, []string{},
|
||||||
"LDFLAGS="+earlyLDFLAGS(false),
|
"LDFLAGS="+earlyLDFLAGS(false),
|
||||||
),
|
),
|
||||||
cmake: []KV{
|
Flag: TExclusive,
|
||||||
|
}, &CMakeHelper{
|
||||||
|
Variant: "compiler-rt",
|
||||||
|
Append: []string{"compiler-rt"},
|
||||||
|
|
||||||
|
Cache: []KV{
|
||||||
{"CMAKE_BUILD_TYPE", "Release"},
|
{"CMAKE_BUILD_TYPE", "Release"},
|
||||||
|
|
||||||
{"LLVM_HOST_TRIPLE", `"${ROSA_TRIPLE}"`},
|
{"LLVM_HOST_TRIPLE", `"${ROSA_TRIPLE}"`},
|
||||||
@@ -95,11 +104,7 @@ func (t Toolchain) newCompilerRT() (pkg.Artifact, string) {
|
|||||||
{"COMPILER_RT_BUILD_PROFILE", "OFF"},
|
{"COMPILER_RT_BUILD_PROFILE", "OFF"},
|
||||||
{"COMPILER_RT_BUILD_XRAY", "OFF"},
|
{"COMPILER_RT_BUILD_XRAY", "OFF"},
|
||||||
},
|
},
|
||||||
append: []string{"compiler-rt"},
|
Script: `
|
||||||
nonStage0: []pkg.Artifact{
|
|
||||||
muslHeaders,
|
|
||||||
},
|
|
||||||
script: `
|
|
||||||
mkdir -p "/work/system/lib/clang/` + llvmVersionMajor + `/lib/"
|
mkdir -p "/work/system/lib/clang/` + llvmVersionMajor + `/lib/"
|
||||||
ln -s \
|
ln -s \
|
||||||
"../../../${ROSA_TRIPLE}" \
|
"../../../${ROSA_TRIPLE}" \
|
||||||
@@ -112,7 +117,11 @@ ln -s \
|
|||||||
"clang_rt.crtend-` + linuxArch() + `.o" \
|
"clang_rt.crtend-` + linuxArch() + `.o" \
|
||||||
"/work/system/lib/${ROSA_TRIPLE}/crtendS.o"
|
"/work/system/lib/${ROSA_TRIPLE}/crtendS.o"
|
||||||
`,
|
`,
|
||||||
}), llvmVersion
|
},
|
||||||
|
Python,
|
||||||
|
|
||||||
|
KernelHeaders,
|
||||||
|
), llvmVersion
|
||||||
}
|
}
|
||||||
func init() {
|
func init() {
|
||||||
artifactsM[LLVMCompilerRT] = Metadata{
|
artifactsM[LLVMCompilerRT] = Metadata{
|
||||||
|
|||||||
Reference in New Issue
Block a user