diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/mbf/main.go | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cmd/mbf/main.go b/cmd/mbf/main.go index bf057115..cc8a40b2 100644 --- a/cmd/mbf/main.go +++ b/cmd/mbf/main.go @@ -91,7 +91,7 @@ func main() { addr net.UnixAddr ) c := command.New(os.Stderr, log.Printf, "mbf", func([]string) error { - if !rosa.Native().HasStage0() { + if !rosa.Native().HasStageEarly() { return pkg.UnsupportedArchError(runtime.GOARCH) } @@ -131,7 +131,7 @@ func main() { } rosa.Native().DropCaches(flagArch, flags) - if !rosa.Native().HasStage0() { + if !rosa.Native().HasStageEarly() { return pkg.UnsupportedArchError(flagArch) } } @@ -452,8 +452,9 @@ func main() { checksum [2]unique.Handle[pkg.Checksum] ) + _llvm := rosa.H("llvm") if err = cm.Do(func(cache *pkg.Cache) (err error) { - _, llvm := rosa.Native().New(s - 2).Load(rosa.LLVM) + _, llvm := rosa.Native().New(s - 2).Load(_llvm) pathname, _, err = cache.Cure(llvm) return }); err != nil { @@ -462,7 +463,7 @@ func main() { log.Println("stage1:", pathname) if err = cm.Do(func(cache *pkg.Cache) (err error) { - _, llvm := rosa.Native().New(s - 1).Load(rosa.LLVM) + _, llvm := rosa.Native().New(s - 1).Load(_llvm) pathname, checksum[0], err = cache.Cure(llvm) return }); err != nil { @@ -470,7 +471,7 @@ func main() { } log.Println("stage2:", pathname) if err = cm.Do(func(cache *pkg.Cache) (err error) { - _, llvm := rosa.Native().New(s).Load(rosa.LLVM) + _, llvm := rosa.Native().New(s).Load(_llvm) pathname, checksum[1], err = cache.Cure(llvm) return }); err != nil { @@ -492,8 +493,7 @@ func main() { if flagStage0 { if err = cm.Do(func(cache *pkg.Cache) (err error) { - _, stage0 := rosa.Native().New(s).Load(rosa.Stage0) - pathname, _, err = cache.Cure(stage0) + pathname, _, err = cache.Cure(rosa.Native().Std().NewStage0()) return }); err != nil { return @@ -767,14 +767,14 @@ func main() { } } - base := rosa.LLVM + base := rosa.H("llvm") if !flagWithToolchain { base = rosa.H("musl") } handles = append(handles, base, - rosa.Mksh, - rosa.Toybox, + rosa.H("mksh"), + rosa.H("toybox"), ) root := make(pkg.Collect, 0, 6+len(args)) |