Fix clang and llvm versions in scripts (halide#7702)

* fix clangng+llvm versions in files * more fixes
ardier · Mar 3, 2024 · a0a193d · a0a193d
1 parent 56cd44e
commit a0a193d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/dependencies/llvm/CMakeLists.txt b/dependencies/llvm/CMakeLists.txt
@@ -20,8 +20,8 @@ message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
 message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
 message(STATUS "Using ClangConfig.cmake in: ${Clang_DIR}")
 
-if (LLVM_PACKAGE_VERSION VERSION_LESS 14.0)
-    message(FATAL_ERROR "LLVM version must be 14.0 or newer")
+if (LLVM_PACKAGE_VERSION VERSION_LESS 15.0)
+    message(FATAL_ERROR "LLVM version must be 15.0 or newer")
 endif ()
 
 if (LLVM_PACKAGE_VERSION VERSION_GREATER 17.0)

diff --git a/run-clang-format.sh b/run-clang-format.sh
@@ -6,10 +6,10 @@ ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 # We are currently standardized on using LLVM/Clang16 for this script.
 # Note that this is totally independent of the version of LLVM that you
-# are using to build Halide itself. If you don't have LLVM14 installed,
+# are using to build Halide itself. If you don't have LLVM16 installed,
 # you can usually install what you need easily via:
 #
-# sudo apt-get install llvm-16 clang-14 libclang-16-dev clang-tidy-16
+# sudo apt-get install llvm-16 clang-16 libclang-16-dev clang-tidy-16
 # export CLANG_FORMAT_LLVM_INSTALL_DIR=/usr/lib/llvm-16
 
 [ -z "$CLANG_FORMAT_LLVM_INSTALL_DIR" ] && echo "CLANG_FORMAT_LLVM_INSTALL_DIR must point to an LLVM installation dir for this script." && exit

diff --git a/run-clang-tidy.sh b/run-clang-tidy.sh
@@ -10,10 +10,10 @@ FIX=$1
 
 # We are currently standardized on using LLVM/Clang16 for this script.
 # Note that this is totally independent of the version of LLVM that you
-# are using to build Halide itself. If you don't have LLVM14 installed,
+# are using to build Halide itself. If you don't have LLVM16 installed,
 # you can usually install what you need easily via:
 #
-# sudo apt-get install llvm-16 clang-14 libclang-16-dev clang-tidy-16
+# sudo apt-get install llvm-16 clang-16 libclang-16-dev clang-tidy-16
 # export CLANG_TIDY_LLVM_INSTALL_DIR=/usr/lib/llvm-16
 
 [ -z "$CLANG_TIDY_LLVM_INSTALL_DIR" ] && echo "CLANG_TIDY_LLVM_INSTALL_DIR must point to an LLVM installation dir for this script." && exit