rebase of the patches

This commit is contained in:
Sylvestre Ledru 2024-02-23 09:01:00 +01:00
parent 5b030d7eb8
commit 3071f6c49c

View File

@ -3,11 +3,11 @@
tools/llvm-shlib/CMakeLists.txt | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
Index: llvm-toolchain-snapshot_18~++20231209112655+5c8755f9f40e/clang/tools/libclang/CMakeLists.txt
Index: llvm-toolchain-18_18.1.0~++20240223085437+b9029ed0053b/clang/tools/libclang/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_18~++20231209112655+5c8755f9f40e.orig/clang/tools/libclang/CMakeLists.txt
+++ llvm-toolchain-snapshot_18~++20231209112655+5c8755f9f40e/clang/tools/libclang/CMakeLists.txt
@@ -134,7 +134,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE
--- llvm-toolchain-18_18.1.0~++20240223085437+b9029ed0053b.orig/clang/tools/libclang/CMakeLists.txt
+++ llvm-toolchain-18_18.1.0~++20240223085437+b9029ed0053b/clang/tools/libclang/CMakeLists.txt
@@ -135,7 +135,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE
remove_definitions("-D_XOPEN_SOURCE=700")
endif()
@ -16,17 +16,16 @@ Index: llvm-toolchain-snapshot_18~++20231209112655+5c8755f9f40e/clang/tools/libc
OUTPUT_NAME ${output_name}
${SOURCES}
Index: llvm-toolchain-snapshot_18~++20231209112655+5c8755f9f40e/llvm/tools/llvm-shlib/CMakeLists.txt
Index: llvm-toolchain-18_18.1.0~++20240223085437+b9029ed0053b/llvm/tools/llvm-shlib/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_18~++20231209112655+5c8755f9f40e.orig/llvm/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-snapshot_18~++20231209112655+5c8755f9f40e/llvm/tools/llvm-shlib/CMakeLists.txt
@@ -35,6 +35,8 @@ if(LLVM_BUILD_LLVM_DYLIB)
endif()
add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES})
--- llvm-toolchain-18_18.1.0~++20240223085437+b9029ed0053b.orig/llvm/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-18_18.1.0~++20240223085437+b9029ed0053b/llvm/tools/llvm-shlib/CMakeLists.txt
@@ -38,6 +38,8 @@ if(LLVM_BUILD_LLVM_DYLIB)
get_target_property(LLVM_DYLIB_FILENAME LLVM OUTPUT_NAME)
llvm_install_library_symlink(LLVM-${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX} ${LLVM_DYLIB_FILENAME} SHARED COMPONENT LLVM)
+ set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME
+
list(REMOVE_DUPLICATES LIB_NAMES)
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
set(LIB_NAMES -Wl,-all_load ${LIB_NAMES})