From a12d11b2eac1c4f13e24af895e19320d2a26acaf Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Tue, 28 Mar 2023 19:20:36 -0700
Subject: [PATCH] tweak llvm setup script, now puts in a relative git dir and
 some possible failure states are fixed

---
 waterbox/libcxx/setup-llvm.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/waterbox/libcxx/setup-llvm.sh b/waterbox/libcxx/setup-llvm.sh
index 73dcdf8fa3..33d6850253 100755
--- a/waterbox/libcxx/setup-llvm.sh
+++ b/waterbox/libcxx/setup-llvm.sh
@@ -3,19 +3,19 @@ set -e
 LLVM_TAG=llvmorg-16.0.0
 LLVM_DIRS="cmake compiler-rt libunwind libcxx libcxxabi"
 LLVM_PATH=../llvm-project
-LLVM_GIT_DIR=$(git rev-parse --absolute-git-dir)/modules/waterbox/llvm-project
+LLVM_GIT_DIR=$(git rev-parse --git-path modules/waterbox/llvm-project)
 
-if [ -d "$LLVM_PATH" ]; then
-	if [ ! -e "$LLVM_PATH/.git" ] || ! git -C "$LLVM_PATH" rev-parse $LLVM_TAG > /dev/null 2>&1; then
-		rm -rf "$LLVM_PATH"
-		git submodule deinit -f "$LLVM_PATH"
-		rm -rf "$LLVM_GIT_DIR"
-	fi
+if [ ! -e "$LLVM_PATH/.git" ] || ! git -C "$LLVM_PATH" rev-parse $LLVM_TAG > /dev/null 2>&1; then
+	rm -rf "$LLVM_PATH"
+	git submodule deinit -f "$LLVM_PATH"
+	rm -rf "$LLVM_GIT_DIR"
 fi
 
-if [ ! -d "$LLVM_PATH" ]; then
+if [ ! -e "$LLVM_PATH/.git" ]; then
 	git submodule init "$LLVM_PATH"
 	git clone --separate-git-dir="$LLVM_GIT_DIR" --filter=tree:0 --sparse https://github.com/llvm/llvm-project.git "$LLVM_PATH"
+	rm "$LLVM_PATH/.git"
+	printf "%s\n" "gitdir: $LLVM_GIT_DIR" > "$LLVM_PATH/.git"
 fi
 
 cd "$LLVM_PATH"