rebase of the patches

This commit is contained in:
Sylvestre Ledru 2023-11-23 10:57:54 +01:00
parent beec0c2024
commit 4763fb888c

View File

@ -3,10 +3,10 @@
tools/llvm-shlib/CMakeLists.txt | 1 + tools/llvm-shlib/CMakeLists.txt | 1 +
2 files changed, 2 insertions(+), 1 deletion(-) 2 files changed, 2 insertions(+), 1 deletion(-)
Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/libclang/CMakeLists.txt Index: llvm-toolchain-snapshot_18~++20231123105111+b71b32ba872f/clang/tools/libclang/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/tools/libclang/CMakeLists.txt --- llvm-toolchain-snapshot_18~++20231123105111+b71b32ba872f.orig/clang/tools/libclang/CMakeLists.txt
+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/libclang/CMakeLists.txt +++ llvm-toolchain-snapshot_18~++20231123105111+b71b32ba872f/clang/tools/libclang/CMakeLists.txt
@@ -134,7 +134,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE @@ -134,7 +134,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE
remove_definitions("-D_XOPEN_SOURCE=700") remove_definitions("-D_XOPEN_SOURCE=700")
endif() endif()
@ -16,10 +16,10 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/libc
OUTPUT_NAME ${output_name} OUTPUT_NAME ${output_name}
${SOURCES} ${SOURCES}
Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/llvm-shlib/CMakeLists.txt Index: llvm-toolchain-snapshot_18~++20231123105111+b71b32ba872f/llvm/tools/llvm-shlib/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/tools/llvm-shlib/CMakeLists.txt --- llvm-toolchain-snapshot_18~++20231123105111+b71b32ba872f.orig/llvm/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/llvm-shlib/CMakeLists.txt +++ llvm-toolchain-snapshot_18~++20231123105111+b71b32ba872f/llvm/tools/llvm-shlib/CMakeLists.txt
@@ -32,6 +32,8 @@ if(LLVM_BUILD_LLVM_DYLIB) @@ -32,6 +32,8 @@ if(LLVM_BUILD_LLVM_DYLIB)
endif() endif()
add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES}) add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES})
@ -27,5 +27,5 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/llvm-
+ set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME + set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME
+ +
list(REMOVE_DUPLICATES LIB_NAMES) list(REMOVE_DUPLICATES LIB_NAMES)
if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU) if((MINGW) OR (HAIKU)
OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")