diff options
| author | Tom Stellard <tstellar@redhat.com> | 2019-02-06 00:12:56 +0000 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2019-02-06 00:12:56 +0000 |
| commit | ea20c1e91eb82e2f3699cf71a462d9c938c7fa1e (patch) | |
| tree | 195b02b579390006d5d84b72aa0a639701c32ac3 | |
| parent | f7211fd64a89d93a7f4c7762b16b405fef7d8db5 (diff) | |
| download | llvm-ea20c1e91eb82e2f3699cf71a462d9c938c7fa1e.zip llvm-ea20c1e91eb82e2f3699cf71a462d9c938c7fa1e.tar.gz llvm-ea20c1e91eb82e2f3699cf71a462d9c938c7fa1e.tar.bz2 | |
Revert "[cmake] Update SOVERSION for the new versioning scheme"
This reverts commit r292255.
llvm-svn: 353247
| -rw-r--r-- | llvm/cmake/modules/AddLLVM.cmake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake index f5b0df9..6a5b7fd 100644 --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/cmake/modules/AddLLVM.cmake @@ -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() |