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>

5 files changed, 19 insertions, 6 deletions

diff --git a/internal/rosa/package/bison.az b/internal/rosa/package/bison.az
index c732ed1b..5d231777 100644
--- a/internal/rosa/package/bison.az
+++ b/internal/rosa/package/bison.az
@@ -10,7 +10,9 @@ package bison {
 		compress = gzip;
 	};
 
+	toyboxEarly = true;
 	exec = make {
+		omitDefaults = true;
 		check = [
 			"TESTSUITEFLAGS=" + jobsFlagE + "' " + skipGNUTests {
 				tests = [
@@ -24,6 +26,5 @@ package bison {
 		];
 	};
 
-	toyboxEarly = true;
 	inputs = [ m4 ];
 }
diff --git a/internal/rosa/package/byacc.az b/internal/rosa/package/byacc.az
index e79bb1ba..67dc2ad5 100644
--- a/internal/rosa/package/byacc.az
+++ b/internal/rosa/package/byacc.az
@@ -18,5 +18,7 @@ package byacc {
 	writable = true;
 	chmod = true;
 
-	exec = make {};
+	exec = make {
+		omitDefaults = true;
+	};
 }
diff --git a/internal/rosa/package/gnu.az b/internal/rosa/package/gnu.az
index 7cfcc726..d4b9b5b2 100644
--- a/internal/rosa/package/gnu.az
+++ b/internal/rosa/package/gnu.az
@@ -17,9 +17,11 @@ package m4 {
 chmod +w tests/test-c32ispunct.sh && echo '#!/bin/sh' > tests/test-c32ispunct.sh
 `;
 
-	exec = make {};
-
 	toyboxEarly = true;
+	exec = make {
+		omitDefaults = true;
+	};
+
 	inputs = [
 		diffutils,
 
@@ -194,7 +196,9 @@ test_disable '#!/bin/sh' tests/cmp
 `;
 
 	toyboxEarly = true;
-	exec = make {};
+	exec = make {
+		omitDefaults = true;
+	};
 }
 
 package patch {
@@ -218,7 +222,9 @@ test_disable '#!/bin/sh' tests/need-filename
 `;
 
 	toyboxEarly = true;
-	exec = make {};
+	exec = make {
+		omitDefaults = true;
+	};
 }
 
 package grep {
@@ -328,6 +334,7 @@ package bash {
 
 	toyboxEarly = true;
 	exec = make {
+		omitDefaults = true;
 		configure = {
 			"without-bash-malloc";
 		};
@@ -364,6 +371,7 @@ test_disable 'int main(){return 0;}' gnulib-tests/test-lchown.c
 `;
 
 	exec = make {
+		omitDefaults = true;
 		configure = {
 			"enable-single-binary": "symlinks";
 		};
diff --git a/internal/rosa/package/kernel/package.az b/internal/rosa/package/kernel/package.az
index efe2b304..1bf17ae6 100644
--- a/internal/rosa/package/kernel/package.az
+++ b/internal/rosa/package/kernel/package.az
@@ -25,6 +25,7 @@ package kernel-headers {
 	toyboxEarly = true;
 
 	exec = make {
+		omitDefaults = true;
 		skipConfigure = true;
 		make = [
 			"-f /usr/src/kernel-headers/Makefile",
diff --git a/internal/rosa/package/rsync.az b/internal/rosa/package/rsync.az
index 62bb045a..8bb06bcb 100644
--- a/internal/rosa/package/rsync.az
+++ b/internal/rosa/package/rsync.az
@@ -15,6 +15,7 @@ package rsync {
 	toyboxEarly = true;
 
 	exec = make {
+		omitDefaults = true;
 		configure = {
 			"disable-openssl";
 			"disable-xxhash";