This is an archive of the discontinued LLVM Phabricator instance.

Differential D64278

Rename libclang_shared to libclang-cpp
ClosedPublic

Authored by sylvestre.ledru on Jul 6 2019, 12:31 AM.

Details

Reviewers
beanz
tstellar
Commits
rG76b26550e9b9: Rename libclang_shared to libclang-cpp
rL365831: Rename libclang_shared to libclang-cpp
rC365831: Rename libclang_shared to libclang-cpp
Summary

Fix bug 42475

Diff Detail

Repository
rL LLVM

Event Timeline

sylvestre.ledru created this revision.Jul 6 2019, 12:31 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 6 2019, 12:31 AM
Herald added subscribers: cfe-commits, mgorny. · View Herald Transcript
sylvestre.ledru edited the summary of this revision. (Show Details)Jul 6 2019, 12:31 AM
Harbormaster completed remote builds in B34453: Diff 208258.Jul 6 2019, 12:32 AM
kimgr added a subscriber: kimgr.Jul 6 2019, 1:16 AM
tstellar added a comment.Jul 8 2019, 9:05 PM

I'm fine with this new name.

sylvestre.ledru added a comment.Jul 9 2019, 1:46 AM

@beanz works for you?

sylvestre.ledru added a comment.Jul 10 2019, 11:32 PM

I would like to land that before the 9 branch. @tstellar do you sign off on this change? Thanks

beanz accepted this revision.Jul 11 2019, 2:36 PM

This is fine with me. I have no real attachment to the name.

This revision is now accepted and ready to land.Jul 11 2019, 2:36 PM
Closed by commit rL365831: Rename libclang_shared to libclang-cpp (authored by sylvestre). · Explain WhyJul 11 2019, 2:43 PM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptJul 11 2019, 2:43 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
sylvestre.ledru added a comment.Jul 14 2019, 6:34 AM

@beanz By the way, maybe we should add this in the 9 release notes?
Thanks

abrachet mentioned this in D127800: [llvm-driver] Generate symlinks instead of executables for tools.Jul 18 2022, 8:39 AM

Revision Contents

PathSize
cfe/
trunk/
2 lines
cmake/
modules/
2 lines
tools/
clang-shlib/
4 lines

Diff 209346

cfe/trunk/CMakeLists.txt

Show First 20 Lines • Show All 318 Lines • ▼ Show 20 Lines
set(CLANG_VENDOR_UTI "org.llvm.clang" CACHE STRING set(CLANG_VENDOR_UTI "org.llvm.clang" CACHE STRING
"Vendor-specific uti.") "Vendor-specific uti.")
set(CLANG_PYTHON_BINDINGS_VERSIONS "" CACHE STRING set(CLANG_PYTHON_BINDINGS_VERSIONS "" CACHE STRING
"Python versions to install libclang python bindings for") "Python versions to install libclang python bindings for")
set(CLANG_LINK_CLANG_DYLIB ${LLVM_LINK_LLVM_DYLIB} CACHE BOOL set(CLANG_LINK_CLANG_DYLIB ${LLVM_LINK_LLVM_DYLIB} CACHE BOOL
"Link tools against libclang_shared.so") "Link tools against libclang-cpp.so")
if (NOT LLVM_LINK_LLVM_DYLIB AND CLANG_LINK_CLANG_DYLIB) if (NOT LLVM_LINK_LLVM_DYLIB AND CLANG_LINK_CLANG_DYLIB)
message(FATAL_ERROR "Cannot set CLANG_LINK_CLANG_DYLIB=ON when " message(FATAL_ERROR "Cannot set CLANG_LINK_CLANG_DYLIB=ON when "
"LLVM_LINK_LLVM_DYLIB=OFF") "LLVM_LINK_LLVM_DYLIB=OFF")
endif() endif()
# The libdir suffix must exactly match whatever LLVM's configuration used. # The libdir suffix must exactly match whatever LLVM's configuration used.
set(CLANG_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}") set(CLANG_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}")
▲ Show 20 Lines • Show All 523 Lines • Show Last 20 Lines

cfe/trunk/cmake/modules/AddClang.cmake

Show First 20 Lines • Show All 169 Lines • ▼ Show 20 Lines
macro(add_clang_symlink name dest) macro(add_clang_symlink name dest)
add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE)
# Always generate install targets # Always generate install targets
llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE)
endmacro() endmacro()
function(clang_target_link_libraries target type) function(clang_target_link_libraries target type)
if (CLANG_LINK_CLANG_DYLIB) if (CLANG_LINK_CLANG_DYLIB)
target_link_libraries(${target} ${type} clang_shared) target_link_libraries(${target} ${type} clang-cpp)
else() else()
target_link_libraries(${target} ${type} ${ARGN}) target_link_libraries(${target} ${type} ${ARGN})
endif() endif()
endfunction() endfunction()

cfe/trunk/tools/clang-shlib/CMakeLists.txt

# Building libclang_shared.so fails if LLVM_ENABLE_PIC=Off # Building libclang-cpp.so fails if LLVM_ENABLE_PIC=Off
if (NOT LLVM_ENABLE_PIC) if (NOT LLVM_ENABLE_PIC)
return() return()
endif() endif()
get_property(clang_libs GLOBAL PROPERTY CLANG_STATIC_LIBS) get_property(clang_libs GLOBAL PROPERTY CLANG_STATIC_LIBS)
foreach (lib ${clang_libs}) foreach (lib ${clang_libs})
list(APPEND _OBJECTS $<TARGET_OBJECTS:obj.${lib}>) list(APPEND _OBJECTS $<TARGET_OBJECTS:obj.${lib}>)
Show All 23 Linesforeach (lib ${clang_libs})
# The ideal solution here is to bump our minimum CMake requirement to 3.12, # The ideal solution here is to bump our minimum CMake requirement to 3.12,
# which adds support for dependencies on object libraries. Until then, linking # which adds support for dependencies on object libraries. Until then, linking
# both the object and the static libraries seems like the least bad solution. # both the object and the static libraries seems like the least bad solution.
# #
# TODO: Rework this when we bump our minimum CMake version to 3.12 or newer. # TODO: Rework this when we bump our minimum CMake version to 3.12 or newer.
list(APPEND _DEPS ${lib}) list(APPEND _DEPS ${lib})
endforeach () endforeach ()
add_clang_library(clang_shared add_clang_library(clang-cpp
SHARED SHARED
clang-shlib.cpp clang-shlib.cpp
${_OBJECTS} ${_OBJECTS}
LINK_LIBS LINK_LIBS
${_DEPS}) ${_DEPS})