rebase of the patch

This commit is contained in:
Sylvestre Ledru 2017-07-11 18:20:14 +00:00
parent 57a3ca75e5
commit 95670f4bca

View File

@ -3,10 +3,10 @@
tools/llvm-shlib/CMakeLists.txt | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
Index: llvm-toolchain-snapshot_5.0~svn298810/clang/tools/libclang/CMakeLists.txt
Index: llvm-toolchain-snapshot_5.0~svn307684/clang/tools/libclang/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_5.0~svn298810.orig/clang/tools/libclang/CMakeLists.txt
+++ llvm-toolchain-snapshot_5.0~svn298810/clang/tools/libclang/CMakeLists.txt
--- llvm-toolchain-snapshot_5.0~svn307684.orig/clang/tools/libclang/CMakeLists.txt
+++ llvm-toolchain-snapshot_5.0~svn307684/clang/tools/libclang/CMakeLists.txt
@@ -84,7 +84,7 @@ else()
set(output_name "clang")
endif()
@ -16,10 +16,10 @@ Index: llvm-toolchain-snapshot_5.0~svn298810/clang/tools/libclang/CMakeLists.txt
OUTPUT_NAME ${output_name}
${SOURCES}
DEPENDS clang-headers
Index: llvm-toolchain-snapshot_5.0~svn298810/tools/llvm-shlib/CMakeLists.txt
Index: llvm-toolchain-snapshot_5.0~svn307684/tools/llvm-shlib/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_5.0~svn298810.orig/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-snapshot_5.0~svn298810/tools/llvm-shlib/CMakeLists.txt
--- llvm-toolchain-snapshot_5.0~svn307684.orig/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-snapshot_5.0~svn307684/tools/llvm-shlib/CMakeLists.txt
@@ -35,6 +35,7 @@ if(LLVM_DYLIB_EXPORTED_SYMBOL_FILE)
endif()
@ -27,4 +27,4 @@ Index: llvm-toolchain-snapshot_5.0~svn298810/tools/llvm-shlib/CMakeLists.txt
+set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME
list(REMOVE_DUPLICATES LIB_NAMES)
if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly")) # FIXME: It should be "GNU ld for elf"
if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU) OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly")) # FIXME: It should be "GNU ld for elf"