]> granicus.if.org Git - llvm/commitdiff
Revert "[cmake] Update SOVERSION for the new versioning scheme"
authorTom Stellard <tstellar@redhat.com>
Wed, 6 Feb 2019 00:12:56 +0000 (00:12 +0000)
committerTom Stellard <tstellar@redhat.com>
Wed, 6 Feb 2019 00:12:56 +0000 (00:12 +0000)
This reverts commit r292255.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_70@353247 91177308-0d34-0410-b5e6-96231b3b80d8

cmake/modules/AddLLVM.cmake

index f5b0df9f5a6c0067b5ba1271c6fc5a6342c1a988..6a5b7fdff2e4475985e05acca6a810006ba096d1 100644 (file)
@@ -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()