Rename libclang_shared to libclang-cpp

Summary: Fix bug 42475

Reviewers: beanz, tstellar

Reviewed By: beanz

Subscribers: kimgr, mgorny, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D64278

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@365831 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a076682376a58be4e702ee34796a8520bdc26d2..6cf28d8cbbb48cd38ba9760db5aba793475d7589 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -324,7 +324,7 @@ set(CLANG_PYTHON_BINDINGS_VERSIONS "" CACHE STRING
     "Python versions to install libclang python bindings for")
 
 set(CLANG_LINK_CLANG_DYLIB ${LLVM_LINK_LLVM_DYLIB} CACHE BOOL
-    "Link tools against libclang_shared.so")
+    "Link tools against libclang-cpp.so")
 
 if (NOT LLVM_LINK_LLVM_DYLIB AND CLANG_LINK_CLANG_DYLIB)
   message(FATAL_ERROR "Cannot set CLANG_LINK_CLANG_DYLIB=ON when "

diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake
index 33f14246545c2bfd353a12b397c9d5b0de7e3943..9f478496e49935ee65627d3c614851c6dea6246b 100644 (file)
--- a/cmake/modules/AddClang.cmake
+++ b/cmake/modules/AddClang.cmake
@@ -175,7 +175,7 @@ endmacro()
 
 function(clang_target_link_libraries target type)
   if (CLANG_LINK_CLANG_DYLIB)
-    target_link_libraries(${target} ${type} clang_shared)
+    target_link_libraries(${target} ${type} clang-cpp)
   else()
     target_link_libraries(${target} ${type} ${ARGN})
   endif()

diff --git a/tools/clang-shlib/CMakeLists.txt b/tools/clang-shlib/CMakeLists.txt
index 313598a09233738a66ee6b9c7a86722695dcddd1..6f2e4f052e212b9a7249827eaa2555d209fa992c 100644 (file)
--- a/tools/clang-shlib/CMakeLists.txt
+++ b/tools/clang-shlib/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Building libclang_shared.so fails if LLVM_ENABLE_PIC=Off
+# Building libclang-cpp.so fails if LLVM_ENABLE_PIC=Off
 if (NOT LLVM_ENABLE_PIC)
   return()
 endif()
@@ -38,7 +38,7 @@ foreach (lib ${clang_libs})
   list(APPEND _DEPS ${lib})
 endforeach ()
 
-add_clang_library(clang_shared
+add_clang_library(clang-cpp
                   SHARED
                   clang-shlib.cpp
                   ${_OBJECTS}