[libunwind] r374624 - [libunwind] Fix issues introduced in r374606
Petr Hosek via cfe-commits
cfe-commits at lists.llvm.org
Fri Oct 11 18:50:57 PDT 2019
Author: phosek
Date: Fri Oct 11 18:50:57 2019
New Revision: 374624
URL: http://llvm.org/viewvc/llvm-project?rev=374624&view=rev
Log:
[libunwind] Fix issues introduced in r374606
There are few differences in compile flags introduced in r374606
which are causing libcxx-libcxxabi-libunwind-armv8-linux to fail.
This change should address all of those, I've compared the generated
build file from before r374606 and with this change and the set of
flags is the same modulo order.
Modified:
libunwind/trunk/CMakeLists.txt
libunwind/trunk/src/CMakeLists.txt
Modified: libunwind/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libunwind/trunk/CMakeLists.txt?rev=374624&r1=374623&r2=374624&view=diff
==============================================================================
--- libunwind/trunk/CMakeLists.txt (original)
+++ libunwind/trunk/CMakeLists.txt Fri Oct 11 18:50:57 2019
@@ -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}")
Modified: libunwind/trunk/src/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libunwind/trunk/src/CMakeLists.txt?rev=374624&r1=374623&r2=374624&view=diff
==============================================================================
--- libunwind/trunk/src/CMakeLists.txt (original)
+++ libunwind/trunk/src/CMakeLists.txt Fri Oct 11 18:50:57 2019
@@ -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
More information about the cfe-commits
mailing list