From 875e8f23ca0a77b9ca38df880ce25c6f6a7f0596 Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Fri, 17 Feb 2023 11:57:29 +0000 Subject: [PATCH] libcxxabi-fix-link-builtins if LIBCXXABI_USE_COMPILER_RT=ON, add builtins to libcxxabi library flags, otherwise add libgcc following how libunwind does the same Gbp-Pq: Topic libcxx Gbp-Pq: Name libcxxabi-fix-link-builtins.diff --- libcxxabi/src/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt index 762649a965..d188343655 100644 --- a/libcxxabi/src/CMakeLists.txt +++ b/libcxxabi/src/CMakeLists.txt @@ -111,7 +111,9 @@ if (ANDROID AND ANDROID_PLATFORM_LEVEL LESS 21) list(APPEND LIBCXXABI_LIBRARIES android_support) endif() -if (NOT LIBCXXABI_USE_COMPILER_RT) +if (LIBCXXABI_USE_COMPILER_RT) + add_library_flags("${LIBCXXABI_BUILTINS_LIBRARY}") +else() add_library_flags_if(LIBCXXABI_HAS_GCC_LIB gcc) endif () -- 2.30.2