Author: tstellar
Date: Tue Feb 5 16:12:56 2019
New Revision: 353247
URL: http://llvm.org/viewvc/llvm-project?rev=353247&view=rev
Log:
Revert "[cmake] Update SOVERSION for the new versioning scheme"
This reverts commit r292255.
Modified:
llvm/branches/release_70/cmake/modules/AddLLVM.cmake
Modified: llvm/branches/release_70/cmake/modules/AddLLVM.cmake
URL:
http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/cmake/modules/AddLLVM.cmake?rev=353247&r1=353246&r2=353247&view=diff
==============================================================================
--- llvm/branches/release_70/cmake/modules/AddLLVM.cmake (original)
+++ llvm/branches/release_70/cmake/modules/AddLLVM.cmake Tue Feb 5 16:12:56
2019
@@ -498,9 +498,11 @@ function(llvm_add_library name)
if(UNIX AND NOT APPLE AND NOT ARG_SONAME)
set_target_properties(${name}
PROPERTIES
- # Since 4.0.0, the ABI version is indicated by the major version
- SOVERSION ${LLVM_VERSION_MAJOR}
- VERSION
${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX})
+ # Concatenate the version numbers since ldconfig expects exactly
+ # one component indicating the ABI version, while LLVM uses
+ # major+minor for that.
+ SOVERSION ${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR}
+ VERSION
${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX})
endif()
endif()
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
