From 5b5b676132d8a7201b30c7494d2961ab3094b583 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Tue, 14 Apr 2026 02:49:19 +0900 Subject: [PATCH] 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 --- cmd/mbf/main.go | 8 ++++---- internal/rosa/all.go | 4 ++-- internal/rosa/cmake.go | 11 ----------- internal/rosa/llvm.go | 34 +++++++++++++++------------------- internal/rosa/make.go | 5 ----- internal/rosa/meson.go | 5 ----- internal/rosa/musl.go | 2 +- internal/rosa/rosa.go | 6 ++---- internal/rosa/rosa_test.go | 2 +- internal/rosa/stage0.go | 4 ++-- 10 files changed, 27 insertions(+), 54 deletions(-) diff --git a/cmd/mbf/main.go b/cmd/mbf/main.go index c69ba0a6..c79a61bf 100644 --- a/cmd/mbf/main.go +++ b/cmd/mbf/main.go @@ -402,20 +402,20 @@ func main() { ) if pathname, _, err = cache.Cure( - (t - 2).Load(rosa.LLVMClang), + (t - 2).Load(rosa.Clang), ); err != nil { return err } log.Println("stage1:", pathname) if pathname, checksum[0], err = cache.Cure( - (t - 1).Load(rosa.LLVMClang), + (t - 1).Load(rosa.Clang), ); err != nil { return err } log.Println("stage2:", pathname) if pathname, checksum[1], err = cache.Cure( - t.Load(rosa.LLVMClang), + t.Load(rosa.Clang), ); err != nil { return err } @@ -577,7 +577,7 @@ func main() { presets[i] = p } - base := rosa.LLVMClang + base := rosa.Clang if !flagWithToolchain { base = rosa.Musl } diff --git a/internal/rosa/all.go b/internal/rosa/all.go index 5b20909b..2c826933 100644 --- a/internal/rosa/all.go +++ b/internal/rosa/all.go @@ -16,9 +16,9 @@ import ( type PArtifact int const ( - LLVMCompilerRT PArtifact = iota + CompilerRT PArtifact = iota LLVMRuntimes - LLVMClang + Clang // EarlyInit is the Rosa OS init program. EarlyInit diff --git a/internal/rosa/cmake.go b/internal/rosa/cmake.go index 78b2f69c..6aa47fbd 100644 --- a/internal/rosa/cmake.go +++ b/internal/rosa/cmake.go @@ -119,9 +119,6 @@ func init() { // CMakeHelper is the [CMake] build system helper. type CMakeHelper struct { - // Joined with name with a dash if non-empty. - Variant string - // Path elements joined with source. Append []string @@ -136,14 +133,6 @@ type CMakeHelper struct { var _ Helper = new(CMakeHelper) -// name returns its arguments and an optional variant string joined with '-'. -func (attr *CMakeHelper) name(name, version string) string { - if attr != nil && attr.Variant != "" { - name += "-" + attr.Variant - } - return name + "-" + version -} - // extra returns a hardcoded slice of [CMake] and [Ninja]. func (attr *CMakeHelper) extra(int) P { if attr != nil && attr.Make { 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"}, diff --git a/internal/rosa/make.go b/internal/rosa/make.go index 5dbfc684..5a7cc420 100644 --- a/internal/rosa/make.go +++ b/internal/rosa/make.go @@ -78,11 +78,6 @@ type MakeHelper struct { var _ Helper = new(MakeHelper) -// name returns its arguments joined with '-'. -func (*MakeHelper) name(name, version string) string { - return name + "-" + version -} - // extra returns make and other optional dependencies. func (attr *MakeHelper) extra(flag int) P { extra := P{Make} diff --git a/internal/rosa/meson.go b/internal/rosa/meson.go index bf7018ca..890d5bc0 100644 --- a/internal/rosa/meson.go +++ b/internal/rosa/meson.go @@ -67,11 +67,6 @@ type MesonHelper struct { var _ Helper = new(MesonHelper) -// name returns its arguments joined with '-'. -func (*MesonHelper) name(name, version string) string { - return name + "-" + version -} - // extra returns hardcoded meson runtime dependencies. func (*MesonHelper) extra(int) P { return P{Meson} } diff --git a/internal/rosa/musl.go b/internal/rosa/musl.go index 226cf8ca..2e9709cd 100644 --- a/internal/rosa/musl.go +++ b/internal/rosa/musl.go @@ -62,7 +62,7 @@ rmdir -v /work/lib func init() { artifactsM[Musl] = Metadata{ f: func(t Toolchain) (pkg.Artifact, string) { - return t.newMusl(false, t.Load(LLVMCompilerRT)) + return t.newMusl(false, t.Load(CompilerRT)) }, Name: "musl", diff --git a/internal/rosa/rosa.go b/internal/rosa/rosa.go index 8e6d6063..ab230b31 100644 --- a/internal/rosa/rosa.go +++ b/internal/rosa/rosa.go @@ -333,7 +333,7 @@ mkdir -vp /work/system/bin toybox = toyboxEarly } - base := LLVMClang + base := Clang if flag&TNoToolchain != 0 { base = Musl } @@ -420,8 +420,6 @@ const helperInPlace = "\x00" // Helper is a build system helper for [Toolchain.NewPackage]. type Helper interface { - // name returns the value passed to the name argument of [Toolchain.New]. - name(name, version string) string // extra returns helper-specific dependencies. extra(flag int) P @@ -588,7 +586,7 @@ cd '/usr/src/` + name + `/' } return t.New( - helper.name(name, version), + name+"-"+version, attr.Flag, extraRes, nil, diff --git a/internal/rosa/rosa_test.go b/internal/rosa/rosa_test.go index ba51b248..fd92547c 100644 --- a/internal/rosa/rosa_test.go +++ b/internal/rosa/rosa_test.go @@ -94,7 +94,7 @@ func TestCureAll(t *testing.T) { func BenchmarkStage3(b *testing.B) { for b.Loop() { - rosa.Std.Load(rosa.LLVMClang) + rosa.Std.Load(rosa.Clang) b.StopTimer() rosa.DropCaches() diff --git a/internal/rosa/stage0.go b/internal/rosa/stage0.go index f4a2edc5..747fd802 100644 --- a/internal/rosa/stage0.go +++ b/internal/rosa/stage0.go @@ -9,9 +9,9 @@ import ( func (t Toolchain) newStage0() (pkg.Artifact, string) { return t.New("rosa-stage0", 0, []pkg.Artifact{ t.Load(Musl), - t.Load(LLVMCompilerRT), + t.Load(CompilerRT), t.Load(LLVMRuntimes), - t.Load(LLVMClang), + t.Load(Clang), t.Load(Zlib), t.Load(Bzip2),