44 lines
1.9 KiB
Diff
44 lines
1.9 KiB
Diff
From edb0f368b7443939f4f12fe96299d4ca075fb5c2 Mon Sep 17 00:00:00 2001
|
|
From: Nikita Popov <npopov@redhat.com>
|
|
Date: Thu, 4 Aug 2022 16:39:33 +0200
|
|
Subject: [PATCH] Fixup libcxx include path
|
|
|
|
---
|
|
libcxxabi/src/CMakeLists.txt | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt
|
|
index 248acc6567ab..42a7e8b0e882 100644
|
|
--- a/libcxxabi/src/CMakeLists.txt
|
|
+++ b/libcxxabi/src/CMakeLists.txt
|
|
@@ -57,7 +57,7 @@ if (MSVC_IDE OR XCODE)
|
|
endif()
|
|
|
|
# Some files depend on libc++ internals.
|
|
-include_directories("${LIBCXXABI_LIBCXX_PATH}/src")
|
|
+include_directories("${LIBCXXABI_LIBCXX_INCLUDES}")
|
|
|
|
if (LIBCXXABI_HAS_CXA_THREAD_ATEXIT_IMPL)
|
|
add_definitions(-DHAVE___CXA_THREAD_ATEXIT_IMPL)
|
|
@@ -168,7 +168,7 @@ if (LIBCXXABI_USE_LLVM_UNWINDER)
|
|
target_link_libraries(cxxabi_shared_objects PUBLIC unwind_shared)
|
|
endif()
|
|
endif()
|
|
-target_link_libraries(cxxabi_shared_objects PRIVATE cxx-headers ${LIBCXXABI_BUILTINS_LIBRARY} ${LIBCXXABI_SHARED_LIBRARIES} ${LIBCXXABI_LIBRARIES})
|
|
+target_link_libraries(cxxabi_shared_objects PRIVATE ${LIBCXXABI_BUILTINS_LIBRARY} ${LIBCXXABI_SHARED_LIBRARIES} ${LIBCXXABI_LIBRARIES})
|
|
target_link_libraries(cxxabi_shared_objects PUBLIC cxxabi-headers)
|
|
set_target_properties(cxxabi_shared_objects
|
|
PROPERTIES
|
|
@@ -239,7 +239,7 @@ if (LIBCXXABI_USE_LLVM_UNWINDER AND LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC
|
|
target_link_libraries(cxxabi_static_objects PUBLIC unwind_static_objects) # propagate usage requirements
|
|
target_sources(cxxabi_static_objects PUBLIC $<TARGET_OBJECTS:unwind_static_objects>)
|
|
endif()
|
|
-target_link_libraries(cxxabi_static_objects PRIVATE cxx-headers ${LIBCXXABI_STATIC_LIBRARIES} ${LIBCXXABI_LIBRARIES})
|
|
+target_link_libraries(cxxabi_static_objects PRIVATE ${LIBCXXABI_STATIC_LIBRARIES} ${LIBCXXABI_LIBRARIES})
|
|
target_link_libraries(cxxabi_static_objects PUBLIC cxxabi-headers)
|
|
set_target_properties(cxxabi_static_objects
|
|
PROPERTIES
|
|
--
|
|
2.37.1
|
|
|