internal/rosa: remove legacy exec helper

This change also adds a fourth stage to the bootstrap machinery, offering more correct toolchain validation that works around LLVM dynamic linking flaws.

Signed-off-by: Ophestra <cat@gensokyo.uk>

1 files changed, 6 insertions, 19 deletions

diff --git a/internal/rosa/state.go b/internal/rosa/state.go
index 516efd81..9d864a53 100644
--- a/internal/rosa/state.go
+++ b/internal/rosa/state.go
@@ -989,9 +989,6 @@ func (ctx *evalContext) pf(
 		attr    PackageAttr
 		patches []string
 		files   []KV
-		excl    bool
-		early   bool
-		minimal bool
 
 		anitya  int64
 		kc      any
@@ -1020,9 +1017,9 @@ func (ctx *evalContext) pf(
 		k("populateUsrBin"): &attr.PopulateUsrBin,
 		k("patches"):        &patches,
 		k("files"):          &files,
-		k("exclusive"):      &excl,
-		k("toyboxEarly"):    &early,
-		k("minimal"):        &minimal,
+		k("exclusive"):      &attr.Exclusive,
+		k("toyboxEarly"):    &attr.Early,
+		k("minimal"):        &attr.NoToolchain,
 
 		k("checksum"): &kc,
 		k("output"):   &output,
@@ -1116,16 +1113,6 @@ func (ctx *evalContext) pf(
 		)
 	}
 
-	if excl {
-		attr.Flag |= TExclusive
-	}
-	if early {
-		attr.Flag |= TEarly
-	}
-	if minimal {
-		attr.Flag |= TNoToolchain
-	}
-
 	if kc != nil {
 		checksum, ok := kc.(string)
 		if !ok {
@@ -1162,7 +1149,7 @@ func (ctx *evalContext) pf(
 		}
 	}
 
-	v = cachedArtifact{&meta, ctx.t.NewPackage(
+	v = cachedArtifact{&meta, ctx.t.New(
 		meta.Name,
 		meta.Version,
 		source,
@@ -1175,8 +1162,8 @@ func (ctx *evalContext) pf(
 }
 
 var (
-	// ErrToplevel is returned by [S.Evaluate] when encountering a toplevel
-	// expression other than a package declaration.
+	// ErrToplevel is returned by [S.RegisterAzalea] when encountering a
+	// toplevel expression other than a package declaration.
 	ErrToplevel = errors.New("top level must only contain package declarations")
 )