internal/rosa/llvm: migrate compiler-rt

The newLLVM family of functions predate the package system. This change migrates compiler-rt without changing any resulting artifacts.

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

1 files changed, 6 insertions, 5 deletions

diff --git a/cmd/mbf/main.go b/cmd/mbf/main.go
index 74b1bd7f..96e00ef8 100644
--- a/cmd/mbf/main.go
+++ b/cmd/mbf/main.go
@@ -396,9 +396,9 @@ func main() {
 					rosa.SetGentooStage3(flagGentoo, checksum)
 				}
 
-				_, _, _, stage1 := (t - 2).NewLLVM()
-				_, _, _, stage2 := (t - 1).NewLLVM()
-				_, _, _, stage3 := t.NewLLVM()
+				_, _, stage1 := (t - 2).NewLLVM()
+				_, _, stage2 := (t - 1).NewLLVM()
+				_, _, stage3 := t.NewLLVM()
 				var (
 					pathname *check.Absolute
 					checksum [2]unique.Handle[pkg.Checksum]
@@ -577,8 +577,9 @@ func main() {
 				root = rosa.Std.AppendPresets(root, presets...)
 
 				if flagWithToolchain {
-					musl, compilerRT, runtimes, clang := (rosa.Std - 1).NewLLVM()
-					root = append(root, musl, compilerRT, runtimes, clang)
+					boot := rosa.Std - 1
+					musl, runtimes, clang := boot.NewLLVM()
+					root = append(root, musl, boot.Load(rosa.LLVMCompilerRT), runtimes, clang)
 				} else {
 					root = append(root, rosa.Std.Load(rosa.Musl))
 				}