Skip to content

Commit f56a432

Browse files
tstellarllvmbot
authored andcommitted
llvm-shlib: Fix libLLVM-${MAJOR}.so symlink on MacOS (llvm#85163)
This is a partial revert of 10c48a7 with a fix for the symlink target name on MacOS See llvm#84637 (cherry picked from commit ec2b752)
1 parent 7fd9979 commit f56a432

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

llvm/cmake/modules/AddLLVM.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2074,7 +2074,7 @@ function(add_lit_testsuites project directory)
20742074
endfunction()
20752075

20762076
function(llvm_install_library_symlink name dest type)
2077-
cmake_parse_arguments(ARG "" "COMPONENT;SOVERSION" "" ${ARGN})
2077+
cmake_parse_arguments(ARG "FULL_DEST" "COMPONENT" "" ${ARGN})
20782078
foreach(path ${CMAKE_MODULE_PATH})
20792079
if(EXISTS ${path}/LLVMInstallSymlink.cmake)
20802080
set(INSTALL_SYMLINK ${path}/LLVMInstallSymlink.cmake)
@@ -2088,8 +2088,8 @@ function(llvm_install_library_symlink name dest type)
20882088
endif()
20892089

20902090
set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX})
2091-
if (ARG_SOVERSION)
2092-
set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}.${ARG_SOVERSION})
2091+
if (ARG_FULL_DEST)
2092+
set(full_dest ${dest})
20932093
else()
20942094
set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX})
20952095
endif()

llvm/tools/llvm-shlib/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ if(LLVM_BUILD_LLVM_DYLIB)
3535
endif()
3636
add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB OUTPUT_NAME LLVM ${INSTALL_WITH_TOOLCHAIN} ${SOURCES})
3737
# Add symlink for backwards compatibility with old library name
38-
get_target_property(LLVM_DYLIB_SOVERSION LLVM SOVERSION)
39-
llvm_install_library_symlink(LLVM-${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX} LLVM SHARED COMPONENT LLVM SOVERSION ${LLVM_DYLIB_SOVERSION})
38+
llvm_install_library_symlink(LLVM-${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX} $<TARGET_SONAME_FILE_NAME:LLVM> SHARED FULL_DEST COMPONENT LLVM)
4039

4140
list(REMOVE_DUPLICATES LIB_NAMES)
4241
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")

0 commit comments

Comments
 (0)