summaryrefslogtreecommitdiff
path: root/libunwind
diff options
context:
space:
mode:
authorMark de Wever <koraq@xs4all.nl>2023-05-13 11:42:25 +0200
committerMark de Wever <koraq@xs4all.nl>2023-05-13 11:42:25 +0200
commit65429b9af6a2c99d340ab2dcddd41dab201f399c (patch)
treeda714cefe7a0c581cedbabc7d35ebda9f5165e9d /libunwind
parent946e7aa6dce96fd9538e8866a9adb8024b53d8f4 (diff)
downloadllvm-65429b9af6a2c99d340ab2dcddd41dab201f399c.tar.gz
Reland "[CMake] Bumps minimum version to 3.20.0."
The owner of the last two failing buildbots updated CMake. This reverts commit e8e8707b4aa6e4cc04c0cffb2de01d2de71165fc.
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 6f12a160307d..bd49dfbe53b3 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 2eabbe06d1d1..ef3417443872 100644
--- a/libunwind/src/CMakeLists.txt
+++ b/libunwind/src/CMakeLists.txt
@@ -30,8 +30,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()