From 68045e27b8e0f192256997ac9962f5b470650970 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Sun, 10 Nov 2024 22:54:58 +0200
Subject: [PATCH] remove stage3 where redundant

The full run now takes ~2.5h on AMD Ryzen 7 7840HS
---
 run | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/run b/run
index 4fdc7d1..b9adf9a 100755
--- a/run
+++ b/run
@@ -78,10 +78,6 @@ step00() {
   build/stage3/bin/zig build update-zig1
 
   echo "stage1/zig1.wasm.zst built. Bootstrapping zig with it."
-
-  fullbuild 15
-
-  echo "Zig bootstrapped from selfhosted."
 }
 
 # commit 9d93b2ccf11f584320a2c5209dd2d94705167695
@@ -102,8 +98,8 @@ step01() {
     pushd "../zig-$STEP01_"
     cp "$OLDPWD/stage1/zig1.wasm.zst" stage1/
     patch -p1 <"$HERE/0.10.0-675-g9d93b2ccf1-TypeOf-hack.patch"
-    fullbuild 15
-    build/stage3/bin/zig build update-zig1
+    halfbuild 15
+    build/zig2 build update-zig1
     popd
   }
 }
@@ -127,8 +123,8 @@ step02() {
   {
     pushd "../zig-$STEP02_"
     zstd -cd ../zig-$STEP01_/stage1/zig1.wasm.zst >stage1/zig1.wasm
-    fullbuild 15
-    build/stage3/bin/zig build update-zig1
+    halfbuild 15
+    build/zig2 build update-zig1
     popd
   }
 }
@@ -148,7 +144,7 @@ step03() {
   {
     pushd "../zig-$STEP03_"
     patch -p1 <"$HERE/0.10.0-747-g7b2a936173-CallOptions.patch"
-    "../zig-$STEP02_/build/stage3/bin/zig" build --zig-lib-dir lib update-zig1
+    ../zig-$STEP02_/build/zig2 build --zig-lib-dir lib update-zig1
     popd
   }
 }
@@ -168,8 +164,8 @@ step04() {
   {
     pushd "../zig-$STEP04_"
     cp ../zig-$STEP03_/stage1/zig1.wasm stage1/zig1.wasm
-    fullbuild 15
-    build/stage3/bin/zig build update-zig1
+    halfbuild 15
+    build/zig2 build update-zig1
     popd
   }
 }
@@ -188,7 +184,7 @@ step05() {
   {
     pushd "../zig-$STEP05_"
     cp ../zig-$STEP04_/stage1/zig1.wasm stage1/zig1.wasm
-    fullbuild 15
+    halfbuild 15
     popd
   }
 }
@@ -206,7 +202,7 @@ step06() {
   git archive --prefix=zig-$STEP06_/ $STEP06 | tar -C .. -x
   {
     pushd "../zig-$STEP06_"
-    "../zig-$STEP05_/build/stage3/bin/zig" build update-zig1
+    ../zig-$STEP05_/build/zig2 build update-zig1
     popd
   }
 }
@@ -262,7 +258,7 @@ step09() {
   {
     pushd "../zig-$STEP09_"
     cp ../zig-$STEP08_/stage1/zig1.wasm stage1/zig1.wasm
-    fullbuild 15
+    halfbuild 15
     popd
   }
 }
@@ -281,8 +277,8 @@ step10() {
   git archive --prefix=zig-$STEP10_/ $STEP10 | tar -C .. -x
   {
     pushd "../zig-$STEP10_"
-    ../zig-$STEP09_/build/stage3/bin/zig build --zig-lib-dir lib update-zig1
-    fullbuild 15
+    ../zig-$STEP09_/build/zig2 build --zig-lib-dir lib update-zig1
+    halfbuild 15
     popd
   }
 }
@@ -300,8 +296,7 @@ step11() {
   git archive --prefix=zig-$STEP11_/ $STEP11 | tar -C .. -x
   {
     pushd "../zig-$STEP11_"
-    ../zig-$STEP10_/build/stage3/bin/zig build --zig-lib-dir lib update-zig1
-    fullbuild 15
+    ../zig-$STEP10_/build/zig2 build --zig-lib-dir lib update-zig1
     popd
   }
 }
@@ -778,7 +773,7 @@ step33() {
     pushd "../zig-$STEP33_"
     cp ../zig-$STEP32_/stage1/zig1.wasm stage1/zig1.wasm
     fullbuild 16
-    build/stage3/bin/zig update-zig1
+    build/stage3/bin/zig build update-zig1
     popd
   }
 }