[build] Support any 13<clang<=15 as CLANG_EXECUTABLE on macOS (taichi…

…-dev#6682)
zerolyj · Nov 21, 2022 · fc5b498 · fc5b498
1 parent a51c481
commit fc5b498
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -111,11 +111,11 @@ endmacro()
 
 if (APPLE)
   set(CLANG_OSX_FLAGS "-isysroot${CMAKE_OSX_SYSROOT}")
-  set(CLANG_HIGHEST_VERSION "13")
-else()
-  set(CLANG_HIGHEST_VERSION "15")
 endif()
 
+# Highest clang version that we've tested
+set(CLANG_HIGHEST_VERSION "15")
+
 check_clang_version()
 
 if (${CLANG_VERSION_MAJOR} VERSION_GREATER ${CLANG_HIGHEST_VERSION})

diff --git a/external/SPIRV-Headers b/external/SPIRV-Headers
diff --git a/external/SPIRV-Tools b/external/SPIRV-Tools
+5 −0		CMakeLists.txt
+4 −2		include/spirv/spir-v.xml
+1,878 −0		include/spirv/unified1/spirv.bf
+327 −1		include/spirv/unified1/spirv.core.grammar.json
+38 −1		include/spirv/unified1/spirv.cs
+55 −1		include/spirv/unified1/spirv.h
+55 −1		include/spirv/unified1/spirv.hpp
+55 −1		include/spirv/unified1/spirv.hpp11
+42 −7		include/spirv/unified1/spirv.json
+38 −1		include/spirv/unified1/spirv.lua
+38 −1		include/spirv/unified1/spirv.py
+38 −1		include/spirv/unified1/spv.d
+45 −1		tools/buildHeaders/header.cpp
+1 −0		tools/buildHeaders/header.h
+3 −0		tools/buildHeaders/main.cpp