internal/rosa/cmake: remove variant

This has no effect outside formatting of name and is a remnant of the old llvm helpers.

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

1 files changed, 15 insertions, 19 deletions

diff --git a/internal/rosa/llvm.go b/internal/rosa/llvm.go
index 2361371a..35b92d80 100644
--- a/internal/rosa/llvm.go
+++ b/internal/rosa/llvm.go
@@ -15,7 +15,7 @@ var llvmSource = newFromGitHub(
 
 func (t Toolchain) newCompilerRT() (pkg.Artifact, string) {
 	muslHeaders, _ := t.newMusl(true)
-	return t.NewPackage("llvm", llvmVersion, llvmSource, &PackageAttr{
+	return t.NewPackage("compiler-rt", llvmVersion, llvmSource, &PackageAttr{
 		Patches: llvmPatches,
 		NonStage0: []pkg.Artifact{
 			muslHeaders,
@@ -25,8 +25,7 @@ func (t Toolchain) newCompilerRT() (pkg.Artifact, string) {
 		),
 		Flag: TExclusive,
 	}, &CMakeHelper{
-		Variant: "compiler-rt",
-		Append:  []string{"compiler-rt"},
+		Append: []string{"compiler-rt"},
 
 		Cache: []KV{
 			{"CMAKE_BUILD_TYPE", "Release"},
@@ -69,10 +68,10 @@ ln -s \
 	), llvmVersion
 }
 func init() {
-	artifactsM[LLVMCompilerRT] = Metadata{
+	artifactsM[CompilerRT] = Metadata{
 		f: Toolchain.newCompilerRT,
 
-		Name:        "llvm-compiler-rt",
+		Name:        "compiler-rt",
 		Description: "LLVM runtime: compiler-rt",
 		Website:     "https://llvm.org/",
 
@@ -83,16 +82,15 @@ func init() {
 }
 
 func (t Toolchain) newLLVMRuntimes() (pkg.Artifact, string) {
-	return t.NewPackage("llvm", llvmVersion, llvmSource, &PackageAttr{
+	return t.NewPackage("llvm-runtimes", llvmVersion, llvmSource, &PackageAttr{
 		Patches:   llvmPatches,
-		NonStage0: t.AppendPresets(nil, LLVMCompilerRT),
+		NonStage0: t.AppendPresets(nil, CompilerRT),
 		Env: stage0ExclConcat(t, []string{},
 			"LDFLAGS="+earlyLDFLAGS(false),
 		),
 		Flag: TExclusive,
 	}, &CMakeHelper{
-		Variant: "runtimes",
-		Append:  []string{"runtimes"},
+		Append: []string{"runtimes"},
 
 		Cache: []KV{
 			{"CMAKE_BUILD_TYPE", "Release"},
@@ -132,12 +130,12 @@ func init() {
 		Website:     "https://llvm.org/",
 
 		Dependencies: P{
-			LLVMCompilerRT,
+			CompilerRT,
 		},
 	}
 }
 
-func (t Toolchain) newLLVMClang() (pkg.Artifact, string) {
+func (t Toolchain) newClang() (pkg.Artifact, string) {
 	target := "'AArch64;RISCV;X86'"
 	if t.isStage0() {
 		switch runtime.GOARCH {
@@ -153,7 +151,7 @@ func (t Toolchain) newLLVMClang() (pkg.Artifact, string) {
 		}
 	}
 
-	return t.NewPackage("llvm", llvmVersion, llvmSource, &PackageAttr{
+	return t.NewPackage("clang", llvmVersion, llvmSource, &PackageAttr{
 		Patches:   llvmPatches,
 		NonStage0: t.AppendPresets(nil, LLVMRuntimes),
 		Env: stage0ExclConcat(t, []string{},
@@ -163,8 +161,7 @@ func (t Toolchain) newLLVMClang() (pkg.Artifact, string) {
 		),
 		Flag: TExclusive,
 	}, &CMakeHelper{
-		Variant: "clang",
-		Append:  []string{"llvm"},
+		Append: []string{"llvm"},
 
 		Cache: []KV{
 			{"CMAKE_BUILD_TYPE", "Release"},
@@ -215,8 +212,8 @@ ninja check-all
 	), llvmVersion
 }
 func init() {
-	artifactsM[LLVMClang] = Metadata{
-		f: Toolchain.newLLVMClang,
+	artifactsM[Clang] = Metadata{
+		f: Toolchain.newClang,
 
 		Name:        "clang",
 		Description: `an "LLVM native" C/C++/Objective-C compiler`,
@@ -231,9 +228,8 @@ func init() {
 }
 
 func (t Toolchain) newLibclc() (pkg.Artifact, string) {
-	return t.NewPackage("llvm", llvmVersion, llvmSource, nil, &CMakeHelper{
-		Variant: "libclc",
-		Append:  []string{"libclc"},
+	return t.NewPackage("libclc", llvmVersion, llvmSource, nil, &CMakeHelper{
+		Append: []string{"libclc"},
 
 		Cache: []KV{
 			{"CMAKE_BUILD_TYPE", "Release"},