internal/rosa/llvm: make source independently available
All checks were successful
Test / Create distribution (push) Successful in 1m29s
Test / Sandbox (push) Successful in 4m36s
Test / Hakurei (push) Successful in 7m41s
Test / ShareFS (push) Successful in 8m18s
Test / Sandbox (race detector) (push) Successful in 8m26s
Test / Hakurei (race detector) (push) Successful in 11m9s
Test / Flake checks (push) Successful in 2m31s
All checks were successful
Test / Create distribution (push) Successful in 1m29s
Test / Sandbox (push) Successful in 4m36s
Test / Hakurei (push) Successful in 7m41s
Test / ShareFS (push) Successful in 8m18s
Test / Sandbox (race detector) (push) Successful in 8m26s
Test / Hakurei (race detector) (push) Successful in 11m9s
Test / Flake checks (push) Successful in 2m31s
This is unfortunately still required, due to the monorepo nature of LLVM. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -171,7 +171,8 @@ const (
|
|||||||
// PresetUnexportedStart is the first unexported preset.
|
// PresetUnexportedStart is the first unexported preset.
|
||||||
PresetUnexportedStart
|
PresetUnexportedStart
|
||||||
|
|
||||||
buildcatrust = iota - 1
|
llvmSource = iota - 1
|
||||||
|
buildcatrust
|
||||||
utilMacros
|
utilMacros
|
||||||
|
|
||||||
// Musl is a standalone libc that does not depend on the toolchain.
|
// Musl is a standalone libc that does not depend on the toolchain.
|
||||||
|
|||||||
@@ -9,11 +9,6 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func (t Toolchain) newLLVM() (pkg.Artifact, string) {
|
func (t Toolchain) newLLVM() (pkg.Artifact, string) {
|
||||||
const (
|
|
||||||
version = "22.1.4"
|
|
||||||
checksum = "Bk3t-tV5sD5T0bqefFMcLeFuAwXnhFipywZmqst5hAZs97QQWGKB_5XyAFjj5tDB"
|
|
||||||
)
|
|
||||||
|
|
||||||
cache := []KV{
|
cache := []KV{
|
||||||
{"CMAKE_BUILD_TYPE", "Release"},
|
{"CMAKE_BUILD_TYPE", "Release"},
|
||||||
|
|
||||||
@@ -127,11 +122,8 @@ func (t Toolchain) newLLVM() (pkg.Artifact, string) {
|
|||||||
}...)
|
}...)
|
||||||
}
|
}
|
||||||
|
|
||||||
return t.NewPackage("llvm", version, t.NewPatchedSource("llvm", version, newFromGitHub(
|
version := t.Version(llvmSource)
|
||||||
"llvm/llvm-project",
|
return t.NewPackage("llvm", version, t.Load(llvmSource), nil, &CMakeHelper{
|
||||||
"llvmorg-"+version,
|
|
||||||
checksum,
|
|
||||||
), true, llvmPatches...), nil, &CMakeHelper{
|
|
||||||
Append: []string{"llvm"},
|
Append: []string{"llvm"},
|
||||||
|
|
||||||
Cache: cache,
|
Cache: cache,
|
||||||
@@ -174,6 +166,26 @@ ninja ` + jobsFlagE + ` check-all
|
|||||||
), version
|
), version
|
||||||
}
|
}
|
||||||
func init() {
|
func init() {
|
||||||
|
const (
|
||||||
|
version = "22.1.4"
|
||||||
|
checksum = "Bk3t-tV5sD5T0bqefFMcLeFuAwXnhFipywZmqst5hAZs97QQWGKB_5XyAFjj5tDB"
|
||||||
|
)
|
||||||
|
|
||||||
|
artifactsM[llvmSource] = Metadata{
|
||||||
|
f: func(t Toolchain) (pkg.Artifact, string) {
|
||||||
|
return t.NewPatchedSource("llvm", version, newFromGitHub(
|
||||||
|
"llvm/llvm-project",
|
||||||
|
"llvmorg-"+version,
|
||||||
|
checksum,
|
||||||
|
), true, llvmPatches...), version
|
||||||
|
},
|
||||||
|
|
||||||
|
Name: "llvm-project",
|
||||||
|
Description: "LLVM monorepo with Rosa OS patches",
|
||||||
|
|
||||||
|
ID: 1830,
|
||||||
|
}
|
||||||
|
|
||||||
artifactsM[LLVM] = Metadata{
|
artifactsM[LLVM] = Metadata{
|
||||||
f: Toolchain.newLLVM,
|
f: Toolchain.newLLVM,
|
||||||
|
|
||||||
@@ -186,7 +198,5 @@ func init() {
|
|||||||
Zstd,
|
Zstd,
|
||||||
Musl,
|
Musl,
|
||||||
},
|
},
|
||||||
|
|
||||||
ID: 1830,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user