From f2c73437874def5d6e3f32055fdf29813cb3689a Mon Sep 17 00:00:00 2001
From: "Lance R. Vick" <lance@lrvick.net>
Date: Fri, 22 Dec 2023 23:27:42 -0800
Subject: [PATCH] restructure bootstrap

---
 src/bootstrap/build.mk | 25 +++++--------------------
 src/core/build.mk      | 15 +++++++++++++++
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/bootstrap/build.mk b/src/bootstrap/build.mk
index dfb7d7e..ae733a6 100644
--- a/src/bootstrap/build.mk
+++ b/src/bootstrap/build.mk
@@ -1,25 +1,10 @@
 .PHONY: bootstrap
-core: \
-	out/gcc.tgz \
-	out/musl.tgz \
-	out/make.tgz \
-	out/binutils.tgz \
-	out/busybox.tgz
+bootstrap: \
+	out/bootstrap.tgz \
+	out/stage0.tgz
 
 out/bootstrap.tgz:
 	$(call build,bootstrap,bootstrap)
 
-out/musl.tgz: out/bootstrap.tgz
-	$(call build,bootstrap,musl)
-
-out/busybox.tgz: out/bootstrap.tgz
-	$(call build,bootstrap,busybox)
-
-out/binutils.tgz: out/bootstrap.tgz
-	$(call build,bootstrap,binutils)
-
-out/gcc.tgz: out/bootstrap.tgz out/musl.tgz
-	$(call build,bootstrap,gcc)
-
-out/make.tgz: out/bootstrap.tgz
-	$(call build,bootstrap,make)
+out/stage0.tgz:
+	$(call build,bootstrap,stage0)
diff --git a/src/core/build.mk b/src/core/build.mk
index 10e05bb..c15cdf9 100644
--- a/src/core/build.mk
+++ b/src/core/build.mk
@@ -7,6 +7,21 @@ core: \
 	out/gcc.tgz \
 	out/llvm.tgz
 
+out/musl.tgz: out/bootstrap.tgz
+	$(call build,core,musl)
+
+out/busybox.tgz: out/bootstrap.tgz
+	$(call build,core,busybox)
+
+out/binutils.tgz: out/bootstrap.tgz
+	$(call build,core,binutils)
+
+out/gcc.tgz: out/bootstrap.tgz out/musl.tgz
+	$(call build,core,gcc)
+
+out/make.tgz: out/bootstrap.tgz
+	$(call build,core,make)
+
 out/bash.tgz: \
 	out/busybox.tgz \
 	out/gcc.tgz \