Skip to content

Commit 34033dc

Browse files
authored
[clangd] Use clang_target_link_libraries() for clang libs (#94937)
Use clang_target_link_libraries() instead of LINK_LIBS when linking clang libraries. This ensures that in CLANG_LINK_CLANG_DYLIB mode we link against libclang-cpp.so (instead of linking against both it and the static libraries). Most places were already doing this correctly, there were just a handful of leftovers.
1 parent 1bebb99 commit 34033dc

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

clang-tools-extra/clangd/index/remote/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ if (CLANGD_ENABLE_REMOTE)
2626
clangdRemoteIndexProto
2727
clangdRemoteIndexServiceProto
2828
clangdRemoteMarshalling
29-
clangBasic
3029
clangDaemon
3130
clangdSupport
3231

@@ -35,6 +34,11 @@ if (CLANGD_ENABLE_REMOTE)
3534
clangdRemoteIndexServiceProto
3635
)
3736

37+
clang_target_link_libraries(clangdRemoteIndex
38+
PRIVATE
39+
clangBasic
40+
)
41+
3842
add_subdirectory(marshalling)
3943
add_subdirectory(server)
4044
add_subdirectory(monitor)

clang-tools-extra/pseudo/lib/CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ add_clang_library(clangPseudo
1414
Token.cpp
1515

1616
LINK_LIBS
17-
clangBasic
18-
clangLex
1917
clangPseudoGrammar
2018

2119
DEPENDS
@@ -25,3 +23,9 @@ add_clang_library(clangPseudo
2523
target_include_directories(clangPseudo INTERFACE
2624
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
2725
)
26+
27+
clang_target_link_libraries(clangPseudo
28+
PRIVATE
29+
clangBasic
30+
clangLex
31+
)

clang-tools-extra/pseudo/lib/cxx/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ add_clang_library(clangPseudoCXX
99
cxx_gen
1010

1111
LINK_LIBS
12-
clangBasic
1312
clangPseudo
1413
clangPseudoGrammar
1514
)
15+
16+
clang_target_link_libraries(clangPseudoCXX
17+
PRIVATE
18+
clangBasic
19+
)

0 commit comments

Comments
 (0)