From 8a67136aee670294108b9f77624f21a2b13d579d Mon Sep 17 00:00:00 2001
From: Kees Bakker <kees@ijzerbout.nl>
Date: Sat, 24 Feb 2024 22:41:22 +0100
Subject: [PATCH] fix: allow re-running buildit.sh

It was not possible run buildit.sh for a second time because the "git pull"
would fail. The reason it failed is that the llvm git repo was checked out
on a tag (without a local branch).
---
 utils/vagrant/buildit.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/utils/vagrant/buildit.sh b/utils/vagrant/buildit.sh
index 5cda634..e1df35f 100755
--- a/utils/vagrant/buildit.sh
+++ b/utils/vagrant/buildit.sh
@@ -31,11 +31,16 @@ function basicToolCheck {
 basicToolCheck
 
 LLVM_DIR=llvm
+TAG=llvmorg-14.0.6
 
 if [ -d $LLVM_DIR ]; then
-    git -C $LLVM_DIR pull
+    :
+    # We can't pull if we don't have an upstream branch
+    # git -C $LLVM_DIR pull
 else
-    git clone https://github.com/llvm/llvm-project.git $LLVM_DIR --branch llvmorg-14.0.6
+    git clone https://github.com/llvm/llvm-project.git $LLVM_DIR  --branch $TAG
+    # Use the tag name for a local branch
+    git -C $LLVM_DIR switch -C $TAG
 fi
 
 CLANG_DIR=$LLVM_DIR/clang
@@ -45,7 +50,7 @@ if [ $(grep -c CCSM_DIR $CMAKE_FILE) -lt 1 ]; then
     CCSM_PATH=$(realpath $1)
     echo "Adding CCSM to clang tools makefile"
     echo "set(CCSM_DIR $CCSM_PATH)" >> $CMAKE_FILE
-    echo "add_subdirectory(\${CCSM_DIR}/src \${CMAKE_CURRENT_BINARY_DIR}/ccsm)" >> $CMAKE_FILE
+    echo 'add_subdirectory(${CCSM_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/ccsm)' >> $CMAKE_FILE
 else
     echo "CCSM already seems to be in the clang tools makefile"
 fi