aboutsummaryrefslogtreecommitdiff
path: root/libunwind
diff options
context:
space:
mode:
authorMark de Wever <koraq@xs4all.nl>2023-02-21 20:09:21 +0100
committerMark de Wever <koraq@xs4all.nl>2023-03-04 12:40:57 +0100
commit44c6b905f8527635e49bb3ea97dea315f92d38ec (patch)
tree39d7a470644408c177fa0fdff64f7c5db2aa24d5 /libunwind
parentfac4c476b97b9f2a9dace059f084696d856c033b (diff)
downloadllvm-44c6b905f8527635e49bb3ea97dea315f92d38ec.zip
llvm-44c6b905f8527635e49bb3ea97dea315f92d38ec.tar.gz
llvm-44c6b905f8527635e49bb3ea97dea315f92d38ec.tar.bz2
[CMake] Bumps minimum version to 3.20.0.
This partly undoes D137724. This change has been discussed on discourse https://discourse.llvm.org/t/rfc-upgrading-llvms-minimum-required-cmake-version/66193 Note this does not remove work-arounds for older CMake versions, that will be done in followup patches. Reviewed By: mehdi_amini, MaskRay, ChuanqiXu, to268, thieta, tschuett, phosek, #libunwind, #libc_vendors, #libc, #libc_abi, sivachandra, philnik, zibi Differential Revision: https://reviews.llvm.org/D144509
Diffstat (limited to 'libunwind')
-rw-r--r--libunwind/CMakeLists.txt2
-rw-r--r--libunwind/src/CMakeLists.txt3
2 files changed, 2 insertions, 3 deletions
diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt
index f82fa0a..bc667c8 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 df32e53..275cabc 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()