This is an archive of the discontinued LLVM Phabricator instance.

Differential D146427

[clang-tools-extra] Fix linking ClangdTests when using libclang-cpp
ClosedPublic

Authored by mgorny on Mar 20 2023, 8:04 AM.

Details

Reviewers
DmitryPolukhin
kadircet
tstellar
MaskRay
thesamesam
Commits
rG3bff90e7e84a: [clang-tools-extra] Fix linking ClangdTests when using libclang-cpp
Summary

Fix linking ClangdTests to specify the dependency on the private
clangTesting library via target_link_libraries() rather than
clang_target_link_libraries(). The latter uses libclang-cpp when
CLANG_LINK_CLANG_DYLIB is used, and clangTesting is not included
in this library.

This fixes d60d3455eb2b375d026a4aa74c4ba0c38f5d323c.

Diff Detail

Event Timeline

mgorny created this revision.Mar 20 2023, 8:04 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 20 2023, 8:04 AM
Herald added subscribers: mikhail.ramalho, arphaman. · View Herald Transcript
mgorny requested review of this revision.Mar 20 2023, 8:04 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 20 2023, 8:04 AM
Herald added a subscriber: ilya-biryukov. · View Herald Transcript
Harbormaster completed remote builds in B220446: Diff 506593.Mar 20 2023, 8:59 AM
mgorny added a reviewer: thesamesam.Mar 24 2023, 10:12 AM

Ping.

mgorny mentioned this in D143436: [clangd] Move standard options adaptor to CommandMangler.Mar 24 2023, 10:14 AM
MaskRay accepted this revision.EditedMar 24 2023, 10:30 AM

(back from a long vacation with little time spending on reviews.llvm.org )

I have verified that tools/clang/tools/extra/clangd/unittests/ClangdTests does not link in -DLLVM_LINK_LLVM_DYLIB=on builds and this patch fixes it. Thanks!

This revision is now accepted and ready to land.Mar 24 2023, 10:30 AM
This revision was landed with ongoing or failed builds.Mar 24 2023, 12:25 PM
Closed by commit rG3bff90e7e84a: [clang-tools-extra] Fix linking ClangdTests when using libclang-cpp (authored by mgorny). · Explain Why
This revision was automatically updated to reflect the committed changes.
mgorny added a commit: rG3bff90e7e84a: [clang-tools-extra] Fix linking ClangdTests when using libclang-cpp.
mgorny added a comment.Mar 24 2023, 12:26 PM

Thank you. 16.x isn't affected.

Revision Contents

PathSize
clang-tools-extra/
clangd/
unittests/
2 lines

Diff 508195

clang-tools-extra/clangd/unittests/CMakeLists.txt

Show First 20 Lines • Show All 151 Lines • ▼ Show 20 Linesclang_target_link_libraries(ClangdTests
clangASTMatchers clangASTMatchers
clangBasic clangBasic
clangFormat clangFormat
clangFrontend clangFrontend
clangIndex clangIndex
clangLex clangLex
clangSema clangSema
clangSerialization clangSerialization
clangTesting
clangTooling clangTooling
clangToolingCore clangToolingCore
clangToolingInclusions clangToolingInclusions
clangToolingInclusionsStdlib clangToolingInclusionsStdlib
clangToolingRefactoring clangToolingRefactoring
clangToolingSyntax clangToolingSyntax
) )
target_link_libraries(ClangdTests target_link_libraries(ClangdTests
PRIVATE PRIVATE
LLVMTestingAnnotations LLVMTestingAnnotations
LLVMTestingSupport LLVMTestingSupport
clangDaemon clangDaemon
clangIncludeCleaner clangIncludeCleaner
clangTesting
clangTidy clangTidy
clangdSupport clangdSupport
) )
if (CLANGD_ENABLE_REMOTE) if (CLANGD_ENABLE_REMOTE)
target_link_libraries(ClangdTests target_link_libraries(ClangdTests
PRIVATE PRIVATE
clangdRemoteMarshalling clangdRemoteMarshalling
Show All 10 Lines