diff options
| -rw-r--r-- | libunwind/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libunwind/src/CMakeLists.txt | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt index 736c5331f6b..36395857de5 100644 --- a/libunwind/CMakeLists.txt +++ b/libunwind/CMakeLists.txt @@ -291,12 +291,12 @@ endif() add_cxx_compile_flags_if_supported(-fstrict-aliasing) add_cxx_compile_flags_if_supported(-EHsc) -add_c_compile_flags_if_supported(-funwind-tables) +add_compile_flags_if_supported(-funwind-tables) add_cxx_compile_flags_if_supported(-fno-exceptions) add_cxx_compile_flags_if_supported(-fno-rtti) # Ensure that we don't depend on C++ standard library. -if (LIBCXXABI_HAS_NOSTDINCXX_FLAG) +if (LIBUNWIND_HAS_NOSTDINCXX_FLAG) list(APPEND LIBUNWIND_COMPILE_FLAGS -nostdinc++) # Remove -stdlib flags to prevent them from causing an unused flag warning. string(REPLACE "-stdlib=libc++" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") diff --git a/libunwind/src/CMakeLists.txt b/libunwind/src/CMakeLists.txt index 0b2a830b2ca..ed20ff0015f 100644 --- a/libunwind/src/CMakeLists.txt +++ b/libunwind/src/CMakeLists.txt @@ -117,6 +117,8 @@ if (LIBUNWIND_ENABLE_SHARED) target_link_libraries(unwind_shared PRIVATE ${LIBUNWIND_LIBRARIES}) set_target_properties(unwind_shared PROPERTIES + CXX_EXTENSIONS + OFF CXX_STANDARD 11 CXX_STANDARD_REQUIRED @@ -143,6 +145,8 @@ if (LIBUNWIND_ENABLE_STATIC) target_link_libraries(unwind_static PRIVATE ${LIBUNWIND_LIBRARIES}) set_target_properties(unwind_static PROPERTIES + CXX_EXTENSIONS + OFF CXX_STANDARD 11 CXX_STANDARD_REQUIRED |
