$NetBSD: patch-src_CMakeLists.txt,v 1.6 2023/12/01 18:27:22 jperkin Exp $ Fix building assembler files. https://github.com/llvm/llvm-project/issues/59978 Use correct flags to link. --- src/CMakeLists.txt.orig 2023-06-10 22:58:16.000000000 +0000 +++ src/CMakeLists.txt @@ -1,4 +1,5 @@ # Get sources +enable_language(ASM) set(LIBUNWIND_CXX_SOURCES libunwind.cpp @@ -31,15 +32,6 @@ set(LIBUNWIND_ASM_SOURCES UnwindRegistersSave.S ) -# See add_asm_sources() in compiler-rt for explanation of this workaround. -# 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")) - set_source_files_properties(${LIBUNWIND_ASM_SOURCES} PROPERTIES LANGUAGE C) -endif() - set(LIBUNWIND_HEADERS AddressSpace.hpp assembly.h @@ -160,7 +152,7 @@ if (LIBUNWIND_ENABLE_SHARED) set_target_properties(unwind_shared PROPERTIES LINK_FLAGS "${LIBUNWIND_LINK_FLAGS}" - LINKER_LANGUAGE C + LINKER_LANGUAGE CXX OUTPUT_NAME "${LIBUNWIND_SHARED_OUTPUT_NAME}" VERSION "1.0" SOVERSION "1" @@ -200,7 +192,7 @@ if (LIBUNWIND_ENABLE_STATIC) set_target_properties(unwind_static PROPERTIES LINK_FLAGS "${LIBUNWIND_LINK_FLAGS}" - LINKER_LANGUAGE C + LINKER_LANGUAGE CXX OUTPUT_NAME "${LIBUNWIND_STATIC_OUTPUT_NAME}" )