diff options
Diffstat (limited to 'cmd/mbf/main.go')
| -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 25902fde..df089e89 100644 --- a/cmd/mbf/main.go +++ b/cmd/mbf/main.go @@ -100,7 +100,7 @@ func main() { rosa.Native().DropCaches("", flags) cross := flagArch != "" && flagArch != runtime.GOARCH if flagQEMU || cross { - cm.qemu, _ = rosa.Native().Load(rosa.Std, rosa.QEMU) + cm.qemu, _ = rosa.Native().Std().Load(rosa.QEMU) } if cross { @@ -349,7 +349,7 @@ func main() { continue } - _, version := rosa.Native().Load(rosa.Std, p) + _, version := rosa.Native().Std().Load(p) if current, latest := version, meta.GetLatest(v); current != latest { @@ -412,9 +412,9 @@ func main() { "stage3", "Check for toolchain 3-stage non-determinism", func(args []string) (err error) { - t := rosa.Std + s := rosa.Std if flagGentoo != "" { - t -= 3 // magic number to discourage misuse + s -= 3 // magic number to discourage misuse var checksum pkg.Checksum if len(flagChecksum) != 0 { @@ -431,7 +431,7 @@ func main() { ) if err = cm.Do(func(cache *pkg.Cache) (err error) { - llvm, _ := rosa.Native().Load(t-2, rosa.LLVM) + llvm, _ := rosa.Native().New(s - 2).Load(rosa.LLVM) pathname, _, err = cache.Cure(llvm) return }); err != nil { @@ -440,7 +440,7 @@ func main() { log.Println("stage1:", pathname) if err = cm.Do(func(cache *pkg.Cache) (err error) { - llvm, _ := rosa.Native().Load(t-1, rosa.LLVM) + llvm, _ := rosa.Native().New(s - 1).Load(rosa.LLVM) pathname, checksum[0], err = cache.Cure(llvm) return }); err != nil { @@ -448,7 +448,7 @@ func main() { } log.Println("stage2:", pathname) if err = cm.Do(func(cache *pkg.Cache) (err error) { - llvm, _ := rosa.Native().Load(t, rosa.LLVM) + llvm, _ := rosa.Native().New(s).Load(rosa.LLVM) pathname, checksum[1], err = cache.Cure(llvm) return }); err != nil { @@ -470,7 +470,7 @@ func main() { if flagStage0 { if err = cm.Do(func(cache *pkg.Cache) (err error) { - stage0, _ := rosa.Native().Load(t, rosa.Stage0) + stage0, _ := rosa.Native().New(s).Load(rosa.Stage0) pathname, _, err = cache.Cure(stage0) return }); err != nil { @@ -524,7 +524,7 @@ func main() { t -= 1 } - a, _ := rosa.Native().Load(t, rosa.ArtifactH(unique.Make(args[0]))) + a, _ := rosa.Native().New(t).Load(rosa.ArtifactH(unique.Make(args[0]))) if a == nil { return fmt.Errorf("unknown artifact %q", args[0]) } @@ -756,7 +756,7 @@ func main() { ) root := make(pkg.Collect, 0, 6+len(args)) - root = rosa.Native().AppendPresets(rosa.Std, root, handles...) + root = rosa.Native().Std().Append(root, handles...) if err := cm.Do(func(cache *pkg.Cache) error { _, _, err := cache.Cure(&root) |