diff options
author | Mark de Wever <koraq@xs4all.nl> | 2023-03-18 13:33:42 +0100 |
---|---|---|
committer | Mark de Wever <koraq@xs4all.nl> | 2023-03-18 13:33:42 +0100 |
commit | a72165e5df59032cdd54dcb18155f2630d73abd1 (patch) | |
tree | ebf7620f30cf1e5765a4ba6f71e5286196ffb550 /libunwind | |
parent | 113f0190dd386d93b42d781b975aa2cca5c88914 (diff) | |
download | llvm-a72165e5df59032cdd54dcb18155f2630d73abd1.tar.gz |
Reland "[CMake] Bumps minimum version to 3.20.0."
This reverts commit 92523a35a827539db8557bbc3ecab7f9ea3f6ade.
Test whether all CI runners are updated.
Diffstat (limited to 'libunwind')
-rw-r--r-- | libunwind/CMakeLists.txt | 2 | ||||
-rw-r--r-- | libunwind/src/CMakeLists.txt | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt index 647b1c41955b..cd38d6539391 100644 --- a/libunwind/CMakeLists.txt +++ b/libunwind/CMakeLists.txt @@ -2,7 +2,7 @@ # Setup Project #=============================================================================== -cmake_minimum_required(VERSION 3.13.4) +cmake_minimum_required(VERSION 3.20.0) set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") diff --git a/libunwind/src/CMakeLists.txt b/libunwind/src/CMakeLists.txt index cced6b4cf9e8..1a5f4e07b278 100644 --- a/libunwind/src/CMakeLists.txt +++ b/libunwind/src/CMakeLists.txt @@ -35,8 +35,7 @@ set(LIBUNWIND_ASM_SOURCES # CMake doesn't work correctly with assembly on AIX. Workaround by compiling # as C files as well. if((APPLE AND CMAKE_VERSION VERSION_LESS 3.19) OR - (MINGW AND CMAKE_VERSION VERSION_LESS 3.17) OR - (${CMAKE_SYSTEM_NAME} MATCHES "AIX")) + (MINGW AND CMAKE_VERSION VERSION_LESS 3.17)) set_source_files_properties(${LIBUNWIND_ASM_SOURCES} PROPERTIES LANGUAGE C) endif() |