diff options
author | Mark de Wever <koraq@xs4all.nl> | 2023-04-15 20:12:24 +0200 |
---|---|---|
committer | Mark de Wever <koraq@xs4all.nl> | 2023-04-15 20:12:24 +0200 |
commit | 44d38022ab29a3156349602733b3459df5beef93 (patch) | |
tree | f219c4e3a499bbb20e28c8047ba00e0e63220054 /libunwind | |
parent | d3df7b1568e72b3f2e99b858f4457f2729368c15 (diff) | |
download | llvm-44d38022ab29a3156349602733b3459df5beef93.tar.gz |
Revert "Revert "Revert "[CMake] Bumps minimum version to 3.20.0."""
This reverts commit 1ef4c3c859728008cf707cad8d67f45ae5070ae1.
Two buildbots still haven't been updated.
Diffstat (limited to 'libunwind')
-rw-r--r-- | libunwind/CMakeLists.txt | 2 | ||||
-rw-r--r-- | libunwind/src/CMakeLists.txt | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt index bd49dfbe53b3..6f12a160307d 100644 --- a/libunwind/CMakeLists.txt +++ b/libunwind/CMakeLists.txt @@ -2,7 +2,7 @@ # Setup Project #=============================================================================== -cmake_minimum_required(VERSION 3.20.0) +cmake_minimum_required(VERSION 3.13.4) set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") diff --git a/libunwind/src/CMakeLists.txt b/libunwind/src/CMakeLists.txt index 1a5f4e07b278..cced6b4cf9e8 100644 --- a/libunwind/src/CMakeLists.txt +++ b/libunwind/src/CMakeLists.txt @@ -35,7 +35,8 @@ 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)) + (MINGW AND CMAKE_VERSION VERSION_LESS 3.17) OR + (${CMAKE_SYSTEM_NAME} MATCHES "AIX")) set_source_files_properties(${LIBUNWIND_ASM_SOURCES} PROPERTIES LANGUAGE C) endif() |