forked from rosa/hakurei
internal/rosa/llvm: migrate musl
This removes the pointless special treatment given to musl. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -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))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user