Skip to content
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

Jump to bottom

Drop support for LLVM 11 #813

Merged
merged 1 commit into from
Jul 26, 2023
Merged

Drop support for LLVM 11 #813

Show file tree
Hide file tree
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
12 changes: 2 additions & 10 deletions cmake/FindLLVM.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,9 @@ if (NOT LLVM_FOUND)
find_package(LLVM 12 QUIET CONFIG)
endif()

if (NOT LLVM_FOUND)
find_package(LLVM 11.1 QUIET CONFIG)
endif()

if (NOT LLVM_FOUND)
find_package(LLVM 11 REQUIRED CONFIG)
endif()

message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
if (${LLVM_PACKAGE_VERSION} VERSION_LESS 11)
message(FATAL_ERROR "LLVM 11 or newer is required")
if (${LLVM_PACKAGE_VERSION} VERSION_LESS 12)
message(FATAL_ERROR "LLVM 12 or newer is required")
endif()

find_program(OPT opt
Expand Down
4 changes: 0 additions & 4 deletions cmake/LLVMKompilePrelude.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,19 @@ find_program(CMAKE_C_COMPILER clang-15)
find_program(CMAKE_C_COMPILER clang-14)
find_program(CMAKE_C_COMPILER clang-13)
find_program(CMAKE_C_COMPILER clang-12)
find_program(CMAKE_C_COMPILER clang-11)
find_program(CMAKE_C_COMPILER clang)
find_program(CMAKE_CXX_COMPILER clang++-15)
find_program(CMAKE_CXX_COMPILER clang++-14)
find_program(CMAKE_CXX_COMPILER clang++-13)
find_program(CMAKE_CXX_COMPILER clang++-12)
find_program(CMAKE_CXX_COMPILER clang++-11)
find_program(CMAKE_CXX_COMPILER clang++)
find_program(CMAKE_C_COMPILER_AR llvm-ar-15)
find_program(CMAKE_C_COMPILER_AR llvm-ar-14)
find_program(CMAKE_C_COMPILER_AR llvm-ar-13)
find_program(CMAKE_C_COMPILER_AR llvm-ar-12)
find_program(CMAKE_C_COMPILER_AR llvm-ar-11)
find_program(CMAKE_C_COMPILER_AR llvm-ar)
find_program(CMAKE_C_COMPILER_RANLIB llvm-ranlib-15)
find_program(CMAKE_C_COMPILER_RANLIB llvm-ranlib-14)
find_program(CMAKE_C_COMPILER_RANLIB llvm-ranlib-13)
find_program(CMAKE_C_COMPILER_RANLIB llvm-ranlib-12)
find_program(CMAKE_C_COMPILER_RANLIB llvm-ranlib-11)
find_program(CMAKE_C_COMPILER_RANLIB llvm-ranlib)
20 changes: 2 additions & 18 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
builtins.listToAttrs (lib.imap0 (i: v: { name = "check_${toString i}"; value = v; }) checks);

matrix = builtins.listToAttrs (lib.forEach (lib.cartesianProductOfSets {
llvm-version = [11 12 13 14 15];
llvm-version = [12 13 14 15];
build-type = ["Debug" "Release" "RelWithDebInfo" "FastBuild" "GcStats"];
}) (
args:
Expand All @@ -117,26 +117,10 @@
};
checks = listToChecks [
# Check that the backend compiles on each supported version of LLVM,
# but don't run the test suite on all 15 configurations.
llvm-backend-11-FastBuild.llvm-backend

# Disable the full set temporarily while the checks run on a hosted
# runner.
# llvm-backend-12-Debug.llvm-backend
# but don't run the test suite on all possible configurations.
llvm-backend-12-FastBuild.llvm-backend

# llvm-backend-13-Debug.llvm-backend
llvm-backend-13-FastBuild.llvm-backend

# llvm-backend-14-Debug.integration-tests
# llvm-backend-14-Release.integration-tests

# llvm-backend-14-RelWithDebInfo.integration-tests
# llvm-backend-14-FastBuild.integration-tests
# llvm-backend-14-GcStats.integration-tests

llvm-backend-14-FastBuild.llvm-backend

llvm-backend-15-FastBuild.integration-tests
];
devShells.default = llvm-backend-15-FastBuild.devShell;
Expand Down
Loading