Skip to content

fix: allow re-running buildit.sh #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
keestux wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: allow re-running buildit.sh #162

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions utils/vagrant/buildit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down