Skip to content

Commit 4eee49a

Browse files
authored
Update supported LLVM versions (#616)
* Update supported LLVM versions * LLVM 12 required if nothing newer
1 parent bcb65db commit 4eee49a

File tree

2 files changed

+10
-22
lines changed

2 files changed

+10
-22
lines changed

CMakeLists.txt

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -86,31 +86,23 @@ endif()
8686
set(CMAKE_AR "${CMAKE_C_COMPILER_AR}")
8787
set(CMAKE_RANLIB "${CMAKE_C_COMPILER_RANLIB}")
8888

89-
find_package(LLVM 14 QUIET CONFIG)
89+
find_package(LLVM 15 QUIET CONFIG)
9090

9191
if (NOT LLVM_FOUND)
92-
find_package(LLVM 13 QUIET CONFIG)
93-
endif()
94-
95-
if (NOT LLVM_FOUND)
96-
find_package(LLVM 12 QUIET CONFIG)
92+
find_package(LLVM 14 QUIET CONFIG)
9793
endif()
9894

9995
if (NOT LLVM_FOUND)
100-
find_package(LLVM 11.1 QUIET CONFIG)
101-
endif()
102-
103-
if (NOT LLVM_FOUND)
104-
find_package(LLVM 11 QUIET CONFIG)
96+
find_package(LLVM 13 QUIET CONFIG)
10597
endif()
10698

10799
if (NOT LLVM_FOUND)
108-
find_package(LLVM 10 REQUIRED CONFIG)
100+
find_package(LLVM 12 REQUIRED CONFIG)
109101
endif()
110102

111103
message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
112-
if (${LLVM_PACKAGE_VERSION} VERSION_LESS 10)
113-
message(FATAL_ERROR "LLVM 10 or newer is required")
104+
if (${LLVM_PACKAGE_VERSION} VERSION_LESS 12)
105+
message(FATAL_ERROR "LLVM 12 or newer is required")
114106
endif()
115107

116108
include(SetTriple)

cmake/LLVMKompilePrelude.cmake

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
1+
find_program(CMAKE_C_COMPILER clang-15)
12
find_program(CMAKE_C_COMPILER clang-14)
23
find_program(CMAKE_C_COMPILER clang-13)
34
find_program(CMAKE_C_COMPILER clang-12)
4-
find_program(CMAKE_C_COMPILER clang-11)
5-
find_program(CMAKE_C_COMPILER clang-10)
65
find_program(CMAKE_C_COMPILER clang)
6+
find_program(CMAKE_CXX_COMPILER clang++-15)
77
find_program(CMAKE_CXX_COMPILER clang++-14)
88
find_program(CMAKE_CXX_COMPILER clang++-13)
99
find_program(CMAKE_CXX_COMPILER clang++-12)
10-
find_program(CMAKE_CXX_COMPILER clang++-11)
11-
find_program(CMAKE_CXX_COMPILER clang++-10)
1210
find_program(CMAKE_CXX_COMPILER clang++)
11+
find_program(CMAKE_C_COMPILER_AR llvm-ar-15)
1312
find_program(CMAKE_C_COMPILER_AR llvm-ar-14)
1413
find_program(CMAKE_C_COMPILER_AR llvm-ar-13)
1514
find_program(CMAKE_C_COMPILER_AR llvm-ar-12)
16-
find_program(CMAKE_C_COMPILER_AR llvm-ar-11)
17-
find_program(CMAKE_C_COMPILER_AR llvm-ar-10)
1815
find_program(CMAKE_C_COMPILER_AR llvm-ar)
16+
find_program(CMAKE_C_COMPILER_RANLIB llvm-ranlib-15)
1917
find_program(CMAKE_C_COMPILER_RANLIB llvm-ranlib-14)
2018
find_program(CMAKE_C_COMPILER_RANLIB llvm-ranlib-13)
2119
find_program(CMAKE_C_COMPILER_RANLIB llvm-ranlib-12)
22-
find_program(CMAKE_C_COMPILER_RANLIB llvm-ranlib-11)
23-
find_program(CMAKE_C_COMPILER_RANLIB llvm-ranlib-10)
2420
find_program(CMAKE_C_COMPILER_RANLIB llvm-ranlib)

0 commit comments

Comments
 (0)