summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Stellard <tstellar@redhat.com>2021-01-21 11:35:48 -0800
committerTom Stellard <tstellar@redhat.com>2021-01-21 11:35:49 -0800
commit3a8282376b6c2bb65a3bb580c10d4da1296d8df1 (patch)
treee63f61d2676b6d5d2e2d493cfa918d121ac077f2
parent9bbcb554cdbf1a7b85e9a72169e4037cf4736a10 (diff)
Add minor version to libclang.so and libclang-cpp.so SONAMEllvmorg-11.1.0-rc2
This patch is for the release/11.x branch. We need to bump the SONAME, because the ABI of the shared library is changing Reviewed By: sylvestre.ledru, cuviper Differential Revision: https://reviews.llvm.org/D94941
-rw-r--r--clang/CMakeLists.txt2
-rw-r--r--clang/tools/clang-shlib/CMakeLists.txt5
-rw-r--r--clang/tools/libclang/CMakeLists.txt1
3 files changed, 7 insertions, 1 deletions
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
index 2e06c5fd9028..bb4b801f01c8 100644
--- a/clang/CMakeLists.txt
+++ b/clang/CMakeLists.txt
@@ -509,7 +509,7 @@ set(CLANG_EXECUTABLE_VERSION
"${CLANG_VERSION_MAJOR}" CACHE STRING
"Major version number that will be appended to the clang executable name")
set(LIBCLANG_LIBRARY_VERSION
- "${CLANG_VERSION_MAJOR}" CACHE STRING
+ "${CLANG_VERSION_MAJOR}.${CLANG_VERSION_MINOR}" CACHE STRING
"Major version number that will be appended to the libclang library")
mark_as_advanced(CLANG_EXECUTABLE_VERSION LIBCLANG_LIBRARY_VERSION)
diff --git a/clang/tools/clang-shlib/CMakeLists.txt b/clang/tools/clang-shlib/CMakeLists.txt
index 5949223fc8e3..47ff80418bb0 100644
--- a/clang/tools/clang-shlib/CMakeLists.txt
+++ b/clang/tools/clang-shlib/CMakeLists.txt
@@ -48,3 +48,8 @@ add_clang_library(clang-cpp
${_OBJECTS}
LINK_LIBS
${_DEPS})
+
+ set_target_properties(clang-cpp
+ PROPERTIES
+ VERSION ${LIBCLANG_LIBRARY_VERSION}
+ SOVERSION ${LIBCLANG_LIBRARY_VERSION})
diff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt
index a4077140acee..5cd9ac5cddc1 100644
--- a/clang/tools/libclang/CMakeLists.txt
+++ b/clang/tools/libclang/CMakeLists.txt
@@ -150,6 +150,7 @@ if(ENABLE_SHARED)
else()
set_target_properties(libclang
PROPERTIES
+ SOVERSION ${LIBCLANG_LIBRARY_VERSION}
VERSION ${LIBCLANG_LIBRARY_VERSION}
DEFINE_SYMBOL _CINDEX_LIB_)
# FIXME: _CINDEX_LIB_ affects dllexport/dllimport on Win32.