[libunwind] ab41ea4 - [libunwind] Use -nostdlib++ when linking libunwind (#75646)
via cfe-commits
cfe-commits at lists.llvm.org
Tue Dec 19 06:05:36 PST 2023
Author: Louis Dionne
Date: 2023-12-19T09:05:32-05:00
New Revision: ab41ea4be364dcac32d0c4ec990735c8adb279c8
URL: https://github.com/llvm/llvm-project/commit/ab41ea4be364dcac32d0c4ec990735c8adb279c8
DIFF: https://github.com/llvm/llvm-project/commit/ab41ea4be364dcac32d0c4ec990735c8adb279c8.diff
LOG: [libunwind] Use -nostdlib++ when linking libunwind (#75646)
We shouldn't need to link against libc++ or libc++abi when building
libunwind, since that would otherwise be a circular dependency.
Added:
Modified:
libunwind/src/CMakeLists.txt
Removed:
################################################################################
diff --git a/libunwind/src/CMakeLists.txt b/libunwind/src/CMakeLists.txt
index abb019b88ebabd..570824260465d6 100644
--- a/libunwind/src/CMakeLists.txt
+++ b/libunwind/src/CMakeLists.txt
@@ -66,20 +66,24 @@ set(LIBUNWIND_SOURCES
${LIBUNWIND_ASM_SOURCES})
# Generate library list.
-if (LIBUNWIND_USE_COMPILER_RT)
- add_library_flags("${LIBUNWIND_BUILTINS_LIBRARY}")
+if (CXX_SUPPORTS_NOSTDLIBXX_FLAG)
+ add_link_flags_if_supported(-nostdlib++)
else()
- add_library_flags_if(LIBUNWIND_HAS_GCC_S_LIB gcc_s)
- add_library_flags_if(LIBUNWIND_HAS_GCC_LIB gcc)
-endif()
-if (NOT APPLE) # On Apple platforms, we don't need to link explicitly against system libraries
+ if (LIBUNWIND_USE_COMPILER_RT)
+ add_library_flags("${LIBUNWIND_BUILTINS_LIBRARY}")
+ else()
+ add_library_flags_if(LIBUNWIND_HAS_GCC_S_LIB gcc_s)
+ add_library_flags_if(LIBUNWIND_HAS_GCC_LIB gcc)
+ endif()
add_library_flags_if(LIBUNWIND_HAS_C_LIB c)
+endif()
+
+if (NOT APPLE)
add_library_flags_if(LIBUNWIND_HAS_DL_LIB dl)
+endif()
- if (LIBUNWIND_ENABLE_THREADS)
+if (LIBUNWIND_ENABLE_THREADS AND NOT APPLE)
add_library_flags_if(LIBUNWIND_HAS_PTHREAD_LIB pthread)
- add_compile_flags_if(LIBUNWIND_WEAK_PTHREAD_LIB -DLIBUNWIND_USE_WEAK_PTHREAD=1)
- endif()
endif()
if (LIBUNWIND_ENABLE_THREADS)
More information about the cfe-commits
mailing list