internal/rosa/llvm: migrate musl
All checks were successful
Test / Create distribution (push) Successful in 2m48s
Test / Sandbox (push) Successful in 6m4s
Test / Hakurei (push) Successful in 7m14s
Test / ShareFS (push) Successful in 7m23s
Test / Sandbox (race detector) (push) Successful in 9m34s
Test / Hakurei (race detector) (push) Successful in 4m2s
Test / Flake checks (push) Successful in 1m33s
All checks were successful
Test / Create distribution (push) Successful in 2m48s
Test / Sandbox (push) Successful in 6m4s
Test / Hakurei (push) Successful in 7m14s
Test / ShareFS (push) Successful in 7m23s
Test / Sandbox (race detector) (push) Successful in 9m34s
Test / Hakurei (race detector) (push) Successful in 4m2s
Test / Flake checks (push) Successful in 1m33s
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