Skip to content

Commit 42ad241

Browse files
committed
Update clang versions for consistency and build version
1 parent 6d35d09 commit 42ad241

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ build_dir=build
88
mkdir -p build
99
cd build
1010

11-
CC=/usr/bin/clang-18 CXX=/usr/bin/clang++-18 cmake ../cmake -DCMAKE_CXX_FLAGS='-stdlib=libc++ -I/usr/lib/llvm-17/include/c++/v1~'
11+
CC=/usr/bin/clang CXX=/usr/bin/clang++ cmake ../cmake -DCMAKE_CXX_FLAGS='-stdlib=libc++'
1212

1313
make -j$(nproc)
1414

setup.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ else #linux
5050
software-properties-common \
5151
wget \
5252
libvulkan1 \
53-
vulkan-utils
53+
vulkan-tools
5454

5555
#install clang and build tools
5656
VERSION=$(lsb_release -rs | cut -d. -f1)
@@ -60,7 +60,11 @@ else #linux
6060
wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
6161
sudo apt-get update
6262
fi
63-
sudo apt-get install -y clang-16 clang++-16 libc++-16-dev libc++abi-16-dev
63+
if [ "$VERSION" == "22" ]; then
64+
sudo apt-get install -y clang-14 clang++-14 libc++-14-dev libc++abi-14-dev
65+
else
66+
sudo apt-get install -y clang-17 clang++-17 libc++-17-dev libc++abi-17-dev
67+
fi
6468
fi
6569

6670
if ! which cmake; then

0 commit comments

Comments
 (0)