internal/rosa/llvm: centralise llvm source

This avoids having to sidestep the NewPackage name formatting machinery to take the cache fast path.

Signed-off-by: Ophestra <cat@gensokyo.uk>

internal/rosa/all.go

@@ -167,7 +167,8 @@ const (
 	// PresetUnexportedStart is the first unexported preset.
 	PresetUnexportedStart
 
-	buildcatrust = iota - 1
+	llvmSource = iota - 1
+	buildcatrust
 	utilMacros
 
 	// Musl is a standalone libc that does not depend on the toolchain.

internal/rosa/llvm.go

@@ -6,17 +6,26 @@ import (
 	"hakurei.app/internal/pkg"
 )
 
-// llvmSource is the unpatched upstream LLVM monorepo.
+func init() {
-var llvmSource = newFromGitHub(
+	artifactsM[llvmSource] = Metadata{
-	"llvm/llvm-project",
+		f: func(t Toolchain) (pkg.Artifact, string) {
-	"llvmorg-"+llvmVersion,
+			return t.NewPatchedSource("llvm", llvmVersion, newFromGitHub(
-	llvmChecksum,
+				"llvm/llvm-project",
-)
+				"llvmorg-"+llvmVersion,
+				llvmChecksum,
+			), true, llvmPatches...), llvmVersion
+		},
+
+		Name:        "llvm-project",
+		Description: "LLVM monorepo with Rosa OS patches",
+
+		ID: 1830,
+	}
+}
 
 func (t Toolchain) newCompilerRT() (pkg.Artifact, string) {
 	muslHeaders, _ := t.newMusl(true)
-	return t.NewPackage("compiler-rt", llvmVersion, llvmSource, &PackageAttr{
+	return t.NewPackage("compiler-rt", llvmVersion, t.Load(llvmSource), &PackageAttr{
-		Patches: llvmPatches,
 		NonStage0: []pkg.Artifact{
 			muslHeaders,
 		},
@@ -82,8 +91,7 @@ func init() {
 }
 
 func (t Toolchain) newLLVMRuntimes() (pkg.Artifact, string) {
-	return t.NewPackage("llvm-runtimes", llvmVersion, llvmSource, &PackageAttr{
+	return t.NewPackage("llvm-runtimes", llvmVersion, t.Load(llvmSource), &PackageAttr{
-		Patches:   llvmPatches,
 		NonStage0: t.AppendPresets(nil, CompilerRT),
 		Env: stage0ExclConcat(t, []string{},
 			"LDFLAGS="+earlyLDFLAGS(false),
@@ -151,8 +159,7 @@ func (t Toolchain) newClang() (pkg.Artifact, string) {
 		}
 	}
 
-	return t.NewPackage("clang", llvmVersion, llvmSource, &PackageAttr{
+	return t.NewPackage("clang", llvmVersion, t.Load(llvmSource), &PackageAttr{
-		Patches:   llvmPatches,
 		NonStage0: t.AppendPresets(nil, LLVMRuntimes),
 		Env: stage0ExclConcat(t, []string{},
 			"CFLAGS="+earlyCFLAGS,
@@ -222,13 +229,11 @@ func init() {
 		Dependencies: P{
 			LLVMRuntimes,
 		},
-
-		ID: 1830,
 	}
 }
 
 func (t Toolchain) newLibclc() (pkg.Artifact, string) {
-	return t.NewPackage("libclc", llvmVersion, llvmSource, nil, &CMakeHelper{
+	return t.NewPackage("libclc", llvmVersion, t.Load(llvmSource), nil, &CMakeHelper{
 		Append: []string{"libclc"},
 
 		Cache: []KV{