From 86ccfba77a7f86120c685220ee03f8ca1c990a08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Sat, 9 Nov 2024 15:16:25 +0200
Subject: [PATCH] step18, 19

---
 run | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/run b/run
index 55241d7..80190f7 100755
--- a/run
+++ b/run
@@ -420,8 +420,44 @@ step17() {
   {
     pushd "../zig-$STEP17_"
     ../zig-$STEP16_/build/zig2 build --zig-lib-dir lib update-zig1
+    popd
+  }
+}
 
-    fullbuild # TODO remove after step18 works
+# commit c839c180ef1686794c039fc6d3c20a8716e87357
+# Author: Andrew Kelley <andrew@ziglang.org>
+# Date:   2023-03-05T21:46:12+02:00
+#
+#     stage2: add zig_backend to ZIR cache namespace
+#
+STEP18=c839c180ef1686794c039fc6d3c20a8716e87357
+STEP18_=0.10.0-1888-gc839c180ef
+step18() {
+  rm -fr "../zig-$STEP18_"
+  git archive --prefix=zig-$STEP18_/ $STEP18 | tar -C .. -x
+  {
+    pushd "../zig-$STEP18_"
+    cp ../zig-$STEP17_/stage1/zig1.wasm stage1/zig1.wasm
+    halfbuild
+    popd
+  }
+}
+
+# commit ac1b0e832b4b9d151098050e1d29e28a568e215c
+# Merge: 2641feb9b9 8558983c86
+# Author: Andrew Kelley <andrew@ziglang.org>
+# Date:   2023-03-06T08:29:56+02:00
+#
+#     Merge pull request #14799 from ziglang/update-zig1
+#
+STEP19=ac1b0e832b4b9d151098050e1d29e28a568e215c
+STEP19_=0.10.0-1891-gac1b0e832b
+step19() {
+  rm -fr "../zig-$STEP19_"
+  git archive --prefix=zig-$STEP19_/ $STEP19 | tar -C .. -x
+  {
+    pushd "../zig-$STEP19_"
+    ../zig-$STEP16_/build/zig2 build --zig-lib-dir lib update-zig1
     popd
   }
 }
@@ -450,4 +486,6 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
   if [[ "$step" -le 15 ]]; then step15; fi
   if [[ "$step" -le 16 ]]; then step16; fi
   if [[ "$step" -le 17 ]]; then step17; fi
+  if [[ "$step" -le 18 ]]; then step18; fi
+  if [[ "$step" -le 19 ]]; then step19; fi
 fi