diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-04-14 00:35:06 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-04-14 00:35:42 +0900 |
| commit | ac825640ab2d03d47101f36a81b9edab7204fced (patch) | |
| tree | eed62bc56c4dc05954a20a84116b426bf1c72a94 /cmd/mbf | |
| parent | a7f7ce17959ccf36201338faeecdbf85d404fe7d (diff) | |
internal/rosa/llvm: migrate musl
This removes the pointless special treatment given to musl.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'cmd/mbf')
| -rw-r--r-- | cmd/mbf/main.go | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/cmd/mbf/main.go b/cmd/mbf/main.go index 96e00ef8..e593c33b 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] @@ -578,8 +578,12 @@ func main() { if flagWithToolchain { boot := rosa.Std - 1 - musl, runtimes, clang := boot.NewLLVM() - root = append(root, musl, boot.Load(rosa.LLVMCompilerRT), runtimes, clang) + runtimes, clang := boot.NewLLVM() + root = append(root, + boot.Load(rosa.Musl), + boot.Load(rosa.LLVMCompilerRT), + runtimes, clang, + ) } else { root = append(root, rosa.Std.Load(rosa.Musl)) } |