rebase of the patch

This commit is contained in:
Sylvestre Ledru 2019-07-12 17:11:27 +02:00
parent 4ae571a7f2
commit db02624892

View File

@ -3,26 +3,26 @@
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_9~svn362869/clang/tools/libclang/CMakeLists.txt Index: llvm-toolchain-snapshot_9~svn365902/clang/tools/libclang/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_9~svn362869.orig/clang/tools/libclang/CMakeLists.txt --- llvm-toolchain-snapshot_9~svn365902.orig/clang/tools/libclang/CMakeLists.txt
+++ llvm-toolchain-snapshot_9~svn362869/clang/tools/libclang/CMakeLists.txt +++ llvm-toolchain-snapshot_9~svn365902/clang/tools/libclang/CMakeLists.txt
@@ -94,7 +94,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE @@ -94,7 +94,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE
remove_definitions("-D_XOPEN_SOURCE=700") remove_definitions("-D_XOPEN_SOURCE=700")
endif() endif()
-add_clang_library(libclang ${ENABLE_SHARED} ${ENABLE_STATIC} -add_clang_library(libclang ${ENABLE_SHARED} ${ENABLE_STATIC} INSTALL_WITH_TOOLCHAIN
+add_clang_library(libclang ${ENABLE_SHARED} ${ENABLE_STATIC} SONAME +add_clang_library(libclang ${ENABLE_SHARED} ${ENABLE_STATIC} INSTALL_WITH_TOOLCHAIN SONAME
OUTPUT_NAME ${output_name} OUTPUT_NAME ${output_name}
${SOURCES} ${SOURCES}
DEPENDS clang-resource-headers DEPENDS clang-resource-headers
Index: llvm-toolchain-snapshot_9~svn362869/tools/llvm-shlib/CMakeLists.txt Index: llvm-toolchain-snapshot_9~svn365902/tools/llvm-shlib/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_9~svn362869.orig/tools/llvm-shlib/CMakeLists.txt --- llvm-toolchain-snapshot_9~svn365902.orig/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-snapshot_9~svn362869/tools/llvm-shlib/CMakeLists.txt +++ llvm-toolchain-snapshot_9~svn365902/tools/llvm-shlib/CMakeLists.txt
@@ -41,6 +41,8 @@ if(LLVM_BUILD_LLVM_DYLIB) @@ -44,6 +44,8 @@ if(LLVM_BUILD_LLVM_DYLIB)
endif()
add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES}) add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES})
+ set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME + set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME
+ +