From 902c9b13904f6b7bec4974ea0f6c456d3a6fb335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Sat, 9 Nov 2024 17:03:42 +0200
Subject: [PATCH] step22, llvm16

---
 run | 81 ++++++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 62 insertions(+), 19 deletions(-)

diff --git a/run b/run
index 348dbd0..55bf2fa 100755
--- a/run
+++ b/run
@@ -6,18 +6,18 @@ fullbuild() {
   rm -fr build
   mkdir build
   pushd build
-  CC=clang-15 CXX=clang++-15 cmake ..
+  CC=clang-$1 CXX=clang++-$1 cmake ..
   make -j"$(nproc)" install
   popd
 }
 
 # zig2
 halfbuild() {
-  sed -i  '/^add_custom_target(stage3/,/^)$/d' CMakeLists.txt
+  sed -i '/^add_custom_target(stage3/,/^)$/d' CMakeLists.txt
   rm -fr build
   mkdir build
   pushd build
-  CC=clang-15 CXX=clang++-15 cmake ..
+  CC=clang-$1 CXX=clang++-$1 cmake ..
   make -j"$(nproc)"
   popd
 }
@@ -65,7 +65,7 @@ step00() {
   git checkout $STEP00_C~1 build.zig CMakeLists.txt
 
   echo "Building the C++ (stage1) implementation"
-  fullbuild
+  fullbuild 15
 
   echo "C++ implementation in build/stage3/bin/zig. Will build zig1.wasm.zst."
 
@@ -76,7 +76,7 @@ step00() {
 
   echo "stage1/zig1.wasm.zst built. Bootstrapping zig with it."
 
-  fullbuild
+  fullbuild 15
 
   echo "Zig bootstrapped from selfhosted."
 }
@@ -99,7 +99,7 @@ step01() {
     pushd "../zig-$STEP01_"
     cp "$OLDPWD/stage1/zig1.wasm.zst" stage1/
     patch -p1 <"$HERE/0.10.0-675-g9d93b2ccf1-TypeOf-hack.patch"
-    fullbuild
+    fullbuild 15
     build/stage3/bin/zig build update-zig1
     popd
   }
@@ -124,7 +124,7 @@ step02() {
   {
     pushd "../zig-$STEP02_"
     zstd -cd ../zig-$STEP01_/stage1/zig1.wasm.zst >stage1/zig1.wasm
-    fullbuild
+    fullbuild 15
     build/stage3/bin/zig build update-zig1
     popd
   }
@@ -165,7 +165,7 @@ step04() {
   {
     pushd "../zig-$STEP04_"
     cp ../zig-$STEP03_/stage1/zig1.wasm stage1/zig1.wasm
-    fullbuild
+    fullbuild 15
     build/stage3/bin/zig build update-zig1
     popd
   }
@@ -185,7 +185,7 @@ step05() {
   {
     pushd "../zig-$STEP05_"
     cp ../zig-$STEP04_/stage1/zig1.wasm stage1/zig1.wasm
-    fullbuild
+    fullbuild 15
     popd
   }
 }
@@ -222,7 +222,7 @@ step07() {
   {
     pushd "../zig-$STEP07_"
     cp ../zig-$STEP06_/stage1/zig1.wasm stage1/zig1.wasm
-    halfbuild
+    halfbuild 15
     popd
   }
 }
@@ -259,7 +259,7 @@ step09() {
   {
     pushd "../zig-$STEP09_"
     cp ../zig-$STEP08_/stage1/zig1.wasm stage1/zig1.wasm
-    fullbuild
+    fullbuild 15
     popd
   }
 }
@@ -279,7 +279,7 @@ step10() {
   {
     pushd "../zig-$STEP10_"
     ../zig-$STEP09_/build/stage3/bin/zig build --zig-lib-dir lib update-zig1
-    fullbuild
+    fullbuild 15
     popd
   }
 }
@@ -298,7 +298,7 @@ step11() {
   {
     pushd "../zig-$STEP11_"
     ../zig-$STEP10_/build/stage3/bin/zig build --zig-lib-dir lib update-zig1
-    fullbuild
+    fullbuild 15
     popd
   }
 }
@@ -320,7 +320,7 @@ step12() {
   {
     pushd "../zig-$STEP12_"
     cp ../zig-$STEP11_/stage1/zig1.wasm stage1/zig1.wasm
-    fullbuild
+    fullbuild 15
     build/stage3/bin/zig build --zig-lib-dir lib update-zig1
     popd
   }
@@ -344,7 +344,7 @@ step13() {
     pushd "../zig-$STEP13_"
     patch -p1 <"$HERE/0.10.0-1638-g7199d7c777-re-add-qualCast.patch"
     ../zig-$STEP12_/build/stage3/bin/zig build --zig-lib-dir lib update-zig1
-    fullbuild
+    fullbuild 15
     popd
   }
 }
@@ -363,7 +363,7 @@ step14() {
   {
     pushd "../zig-$STEP14_"
     cp ../zig-$STEP13_/stage1/zig1.wasm stage1/zig1.wasm
-    halfbuild
+    halfbuild 15
     popd
   }
 }
@@ -401,7 +401,7 @@ step16() {
   {
     pushd "../zig-$STEP16_"
     cp ../zig-$STEP15_/stage1/zig1.wasm stage1/zig1.wasm
-    halfbuild
+    halfbuild 15
     popd
   }
 }
@@ -438,7 +438,7 @@ step18() {
   {
     pushd "../zig-$STEP18_"
     cp ../zig-$STEP17_/stage1/zig1.wasm stage1/zig1.wasm
-    halfbuild
+    halfbuild 15
     popd
   }
 }
@@ -478,11 +478,52 @@ step20() {
   {
     pushd "../zig-$STEP20_"
     cp ../zig-$STEP19_/stage1/zig1.wasm stage1/zig1.wasm
-    halfbuild
+    halfbuild 16
     popd
   }
 }
 
+# commit d3a237a98c5a2ccf72a774b5f93425c02fea4bea
+# Merge: 1728d92f60 3c3cee2cfa
+# Author: Andrew Kelley <andrew@ziglang.org>
+# Date:   2023-04-11T18:54:43+03:00
+#
+#     Merge pull request #15234 from ziglang/remove-legacy-build-api
+#
+#     remove --enable-cache option; std.Build.CompileStep: remove output_dir
+#
+STEP21=d3a237a98c5a2ccf72a774b5f93425c02fea4bea
+STEP21_=0.10.0-2558-gd3a237a98c
+step21() {
+  rm -fr "../zig-$STEP21_"
+  git archive --prefix=zig-$STEP21_/ $STEP21 | tar -C .. -x
+  {
+    pushd "../zig-$STEP21_"
+    cp ../zig-$STEP20_/stage1/zig1.wasm stage1/zig1.wasm
+    halfbuild 16
+    popd
+  }
+}
+
+# commit e2fe1907ecac075e4d4a37776359144318b6055a
+# Author: Andrew Kelley <andrew@ziglang.org>
+# Date:   2023-04-13T07:03:36+03:00
+#
+#     add c_char type
+#
+STEP22=e2fe1907ecac075e4d4a37776359144318b6055a
+STEP22_=0.10.0-2566-ge2fe1907ec
+step22() {
+  rm -fr "../zig-$STEP22_"
+  git archive --prefix=zig-$STEP22_/ $STEP22 | tar -C .. -x
+  git archive --prefix=zig-$STEP22_/ $STEP22~1 lib/std/start.zig | tar -C .. -x
+  {
+    pushd "../zig-$STEP22_"
+    ../zig-$STEP21_/build/zig2 build --zig-lib-dir lib update-zig1
+    halfbuild 16
+    popd
+  }
+}
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
   set -xeuo pipefail
@@ -511,4 +552,6 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
   if [[ "$step" -le 18 ]]; then step18; fi
   if [[ "$step" -le 19 ]]; then step19; fi
   if [[ "$step" -le 20 ]]; then step20; fi
+  if [[ "$step" -le 21 ]]; then step21; fi
+  if [[ "$step" -le 22 ]]; then step22; fi
 fi