From e4554bd4e1e1a212fc234f2ce6c9c2731afe6c7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pekka=20J=C3=A4=C3=A4skel=C3=A4inen?= Date: Tue, 3 Nov 2020 08:22:00 +0200 Subject: [PATCH] LLVM patch to rename the installed .so to libLLVMTCE.so This will be used starting from LLVM 11 to avoid the usual annoying conflicts with system/other LLVM, that seem to be hard to avoid with the broken libtool (see Issue #91). --- tce/tools/patches/llvm-10-llvmtce-so.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 tce/tools/patches/llvm-10-llvmtce-so.patch diff --git a/tce/tools/patches/llvm-10-llvmtce-so.patch b/tce/tools/patches/llvm-10-llvmtce-so.patch new file mode 100644 index 0000000000..608ab22e2b --- /dev/null +++ b/tce/tools/patches/llvm-10-llvmtce-so.patch @@ -0,0 +1,13 @@ +diff --git a/llvm/tools/llvm-shlib/CMakeLists.txt b/llvm/tools/llvm-shlib/CMakeLists.txt +index 3eb6db33a43..0e3a645be6e 100644 +--- llvm/tools/llvm-shlib/CMakeLists.txt ++++ llvm/tools/llvm-shlib/CMakeLists.txt +@@ -30,7 +30,7 @@ if(LLVM_BUILD_LLVM_DYLIB) + if (LLVM_LINK_LLVM_DYLIB) + set(INSTALL_WITH_TOOLCHAIN INSTALL_WITH_TOOLCHAIN) + 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} OUTPUT_NAME "LLVMTCE" ${SOURCES}) + + list(REMOVE_DUPLICATES LIB_NAMES) + if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU)