From e516351ba5715abff408a1051a8dd13f2473c174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Wed, 6 Nov 2024 22:51:44 +0200
Subject: [PATCH] step8 + shellcheck

---
 run | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/run b/run
index fa2537e..19dcec2 100755
--- a/run
+++ b/run
@@ -11,7 +11,7 @@ HERE=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
 #
 #     Nuke the C++ implementation of Zig from orbit using WASI
 MERGE_WASI_BOOTSTRAP=e7d28344fa3ee81d6ad7ca5ce1f83d50d8502118
-MERGE_WASI_BOOTSTRAP_=0.10.0-610-ge7d28344fa
+#MERGE_WASI_BOOTSTRAP_=0.10.0-610-ge7d28344fa
 
 # commit 3ba916584db5485c38ebf2390e8d22bc6d81bf8e
 # Author: Andrew Kelley <andrew@ziglang.org>
@@ -19,7 +19,7 @@ MERGE_WASI_BOOTSTRAP_=0.10.0-610-ge7d28344fa
 #
 #     actually remove stage1
 REMOVE_STAGE1=3ba916584db5485c38ebf2390e8d22bc6d81bf8e
-REMOVE_STAGE1_=0.10.0-542-g3ba916584d
+#REMOVE_STAGE1_=0.10.0-542-g3ba916584d
 
 # commit 28514476ef8c824c3d189d98f23d0f8d23e496ea
 # Author: Andrew Kelley <andrew@ziglang.org>
@@ -30,7 +30,7 @@ REMOVE_STAGE1_=0.10.0-542-g3ba916584d
 #     After this commit, the self-hosted compiler does not offer the option to
 #     use stage1 as a backend anymore.
 REMOVE_FSTAGE1=28514476ef8c824c3d189d98f23d0f8d23e496ea
-REMOVE_FSTAGE1_=0.10.0-539-g28514476ef
+#REMOVE_FSTAGE1_=0.10.0-539-g28514476ef
 
 # commit 9d93b2ccf11f584320a2c5209dd2d94705167695
 # Author: Veikka Tuominen <git@vexu.eu>
@@ -76,9 +76,9 @@ CALL_USAGES_=0.10.0-748-g08b2d491bc
 # commit 35184bff75420f405cb703c9cf86b196843b9a94 (HEAD)
 # Author: r00ster91 <r00ster91@proton.me>
 # Date:   2022-12-13T23:30:06+02:00
-# 
+#
 #     std.builtin: rename Type.UnionField and Type.StructField's field_type to type
-BUILTIN_TYPE=aac2d6b56f32134ea32fb3d984e3fcdfddd8aaf6 
+BUILTIN_TYPE=aac2d6b56f32134ea32fb3d984e3fcdfddd8aaf6
 BUILTIN_TYPE_=0.10.0-851-gaac2d6b56f
 
 # commit 2a5e1426aa9469fadb78e837d0100d689213b034
@@ -92,7 +92,7 @@ REMOVE_BUILTIN_TYPE_=0.10.0-853-g2a5e1426aa
 # commit 54160e7f6aecb4628df633ceaef4c6d956429a3d
 # Author: Veikka Tuominen <git@vexu.eu>
 # Date:   2022-12-21T14:33:02+02:00
-# 
+#
 #     Sema: make overflow arithmetic builtins return tuples
 BUILTINS_4TO2=54160e7f6aecb4628df633ceaef4c6d956429a3d
 BUILTINS_4TO2_=0.10.0-961-g54160e7f6a
@@ -100,7 +100,7 @@ BUILTINS_4TO2_=0.10.0-961-g54160e7f6a
 # commit 622311fb9ac7ee6d93dcb8cda4b608751f7e092a
 # Author: Veikka Tuominen <git@vexu.eu>
 # Date:   2022-12-21T16:40:30+02:00
-# 
+#
 #     update uses of overflow arithmetic builtins
 BUILTINS_4TO2_USES=622311fb9ac7ee6d93dcb8cda4b608751f7e092a
 BUILTINS_4TO2_USES_=0.10.0-962-g622311fb9a
@@ -163,7 +163,6 @@ step1() {
 }
 
 step2() {
-  local FROM="$BOUNDFN"
   local FROM_="$BOUNDFN_"
   local TO="$C_AARCH64"
   local TO_="$C_AARCH64_"
@@ -182,7 +181,6 @@ step2() {
 }
 
 step3() {
-  local FROM="$C_AARCH64"
   local FROM_="$C_AARCH64_"
   local TO="$CALL_OPTIONS"
   local TO_="$CALL_OPTIONS_"
@@ -201,7 +199,6 @@ step3() {
 }
 
 step4() {
-  local FROM="$CALL_OPTIONS"
   local FROM_="$CALL_OPTIONS_"
   local TO="$CALL_USAGES"
   local TO_="$CALL_USAGES_"
@@ -221,7 +218,6 @@ step4() {
 }
 
 step5() {
-  local FROM="$CALL_USAGES"
   local FROM_="$CALL_USAGES_"
   local TO="$BUILTIN_TYPE"
   local TO_="$BUILTIN_TYPE_"
@@ -238,7 +234,6 @@ step5() {
 }
 
 step6() {
-  local FROM="$BUILTIN_TYPE"
   local FROM_="$BUILTIN_TYPE_"
   local TO="$REMOVE_BUILTIN_TYPE"
   local TO_="$REMOVE_BUILTIN_TYPE_"
@@ -255,7 +250,6 @@ step6() {
 }
 
 step7() {
-  local FROM="$REMOVE_BUILTIN_TYPE"
   local FROM_="$REMOVE_BUILTIN_TYPE_"
   local TO="$BUILTINS_4TO2"
   local TO_="$BUILTINS_4TO2_"
@@ -267,14 +261,22 @@ step7() {
     pushd "../zig-$TO_"
     patch -p1 <"$HERE/0.10.0-961-g54160e7f6a-CMakeLists.txt-remove-stage3.patch"
     cp ../zig-$FROM_/stage1/zig1.wasm stage1/zig1.wasm
-    fullbuild
+
+    # same as "fullbuild", except the make target does not have "install"
+    {
+      rm -fr build
+      mkdir build
+      pushd build
+      CC=clang-15 CXX=clang++-15 cmake ..
+      make -j"$(nproc)"
+      popd
+    }
     build/zig2 build update-zig1
     popd
   }
 }
 
 step8() {
-  local FROM="$BUILTINS_4TO2"
   local FROM_="$BUILTINS_4TO2_"
   local TO="$BUILTINS_4TO2_USES"
   local TO_="$BUILTINS_4TO2_USES_"
@@ -291,21 +293,19 @@ step8() {
   }
 }
 
-
-
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
   set -xeuo pipefail
   step=${1:-step0}
   step=${step#step}
 
   # works:
-  if [[ "$step" -le 0 ]] ; then step0; fi
-  if [[ "$step" -le 1 ]] ; then step1; fi
-  if [[ "$step" -le 2 ]] ; then step2; fi
-  if [[ "$step" -le 3 ]] ; then step3; fi
-  if [[ "$step" -le 4 ]] ; then step4; fi
-  if [[ "$step" -le 5 ]] ; then step5; fi
-  if [[ "$step" -le 6 ]] ; then step6; fi
-  if [[ "$step" -le 7 ]] ; then step7; fi
-  if [[ "$step" -le 8 ]] ; then step8; fi
+  if [[ "$step" -le 0 ]]; then step0; fi
+  if [[ "$step" -le 1 ]]; then step1; fi
+  if [[ "$step" -le 2 ]]; then step2; fi
+  if [[ "$step" -le 3 ]]; then step3; fi
+  if [[ "$step" -le 4 ]]; then step4; fi
+  if [[ "$step" -le 5 ]]; then step5; fi
+  if [[ "$step" -le 6 ]]; then step6; fi
+  if [[ "$step" -le 7 ]]; then step7; fi
+  if [[ "$step" -le 8 ]]; then step8; fi
 fi