From 4c8aa666000088e1986b23d9fd637c81e01af259 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Sat, 9 Nov 2024 23:43:10 +0200
Subject: [PATCH] step29, 30

---
 run | 61 +++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/run b/run
index 4f79b1a..fcad247 100755
--- a/run
+++ b/run
@@ -663,7 +663,24 @@ step28() {
     pushd "../zig-$STEP28_"
     cp ../zig-$STEP27_/stage1/zig1.wasm stage1/zig1.wasm
     halfbuild 16
-    build/zig2 build update-zig1
+    popd
+  }
+}
+
+# commit be0c69957e7489423606023ad820599652a60e15
+# Author: Matthew Lugg <mlugg@mlugg.co.uk>
+# Date:   2023-06-20T15:39:35+03:00
+# 
+#     compiler: remove destination type from cast builtins
+# 
+STEP29=be0c69957e7489423606023ad820599652a60e15
+STEP29_=0.10.0-3807-gbe0c69957e
+step29() {
+  rm -fr "../zig-$STEP29_"
+  git archive --prefix=zig-$STEP29_/ $STEP29 | tar -C .. -x
+  {
+    pushd "../zig-$STEP29_"
+    ../zig-$STEP28_/build/zig2 build --zig-lib-dir lib update-zig1
     popd
   }
 }
@@ -677,33 +694,19 @@ step28() {
 #     Needed due to the breaking changes to casting builtins, which are used
 #     by the compiler when building itself.
 #
-#STEP28_A=21ac0beb436f49fe49c6982a872f2dc48e4bea5e
-#STEP28_=0.10.0-3813-g21ac0beb43
-
-# One commit before changing cast builtin syntax:
-#
-# commit 447ca4e3fff021f471b748187b53f0a4744ad0bc
-# Author: Matthew Lugg <mlugg@mlugg.co.uk>
-# Date:   2023-06-23T00:40:13+03:00
-#
-#     translate-c: update to new cast builtin syntax
-#
-#STEP28_B=447ca4e3fff021f471b748187b53f0a4744ad0bc
-#step28() {
-#  rm -fr "../zig-$STEP28_"
-#  git archive --prefix=zig-$STEP28_/ $STEP28_A | tar -C .. -x
-#  mv ../zig-$STEP28_/lib ../zig-$STEP28_/lib.bk
-#  git archive --prefix=zig-$STEP28_/ $STEP28_B lib | tar -C .. -x
-#  {
-#    pushd "../zig-$STEP28_"
-#    cp ../zig-$STEP27_/stage1/zig1.wasm stage1/zig1.wasm
-#    halfbuild 16
-#    rm -fr lib
-#    mv lib.bk lib
-#    build/zig2 build update-zig1
-#    popd
-#  }
-#}
+STEP30=21ac0beb436f49fe49c6982a872f2dc48e4bea5e
+STEP30_=0.10.0-3813-g21ac0beb43
+step30() {
+  rm -fr "../zig-$STEP30_"
+  git archive --prefix=zig-$STEP30_/ $STEP30 | tar -C .. -x
+  {
+    pushd "../zig-$STEP30_"
+    cp ../zig-$STEP29_/stage1/zig1.wasm stage1/zig1.wasm
+    halfbuild 16
+    build/zig2 build update-zig1
+    popd
+  }
+}
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
   set -xeuo pipefail
@@ -740,4 +743,6 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
   if [[ "$step" -le 26 ]]; then step26; fi
   if [[ "$step" -le 27 ]]; then step27; fi
   if [[ "$step" -le 28 ]]; then step28; fi
+  if [[ "$step" -le 29 ]]; then step29; fi
+  if [[ "$step" -le 30 ]]; then step30; fi
 fi