Skip to content

Commit 4751e4f

Browse files
committed
Revert "[cmake] Fix clang builds with BUILD_SHARED=ON and CLANG_LINK_CLANG_DYLIB=ON"
This reverts commit df839cf. This change used cmake's list filter operation which was not added until cmake 3.6.
1 parent df839cf commit 4751e4f

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

clang/tools/clang-shlib/CMakeLists.txt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,9 @@ foreach (lib ${clang_libs})
1414
list(APPEND _OBJECTS $<TARGET_OBJECTS:obj.${lib}>)
1515
endif()
1616
list(APPEND _DEPS $<TARGET_PROPERTY:${lib},INTERFACE_LINK_LIBRARIES>)
17-
get_target_property(interface ${lib} LINK_LIBRARIES)
18-
if (interface)
19-
list(APPEND _DEPS ${interface})
20-
endif()
17+
list(APPEND _DEPS $<TARGET_PROPERTY:${lib},LINK_LIBRARIES>)
2118
endforeach ()
2219

23-
# clang libraries are redundant since we are linking all the individual
24-
# object files into libclang-cpp.so, so filter them out from _DEPS.
25-
# This avoids problems with LLVM global data when building with
26-
# BUILD_SHARED_LIBS=ON
27-
list(FILTER _DEPS EXCLUDE REGEX "^clang")
2820
if (CLANG_LINK_CLANG_DYLIB)
2921
set(INSTALL_WITH_TOOLCHAIN INSTALL_WITH_TOOLCHAIN)
3022
endif()

0 commit comments

Comments
 (0)