diff options
| author | Tom Stellard <tstellar@redhat.com> | 2020-01-22 16:12:45 -0800 |
|---|---|---|
| committer | Hans Wennborg <hans@chromium.org> | 2020-01-23 01:30:58 +0100 |
| commit | ba92233ce227753221e15bfab0326a35ef05caa1 (patch) | |
| tree | 5e3afcd3bfc3e81e34d8bd67b696cfb7deda5505 | |
| parent | 3e429b691ec89de09324d6af33e35f1491f45b7d (diff) | |
| download | bcm5719-llvm-ba92233ce227753221e15bfab0326a35ef05caa1.tar.gz bcm5719-llvm-ba92233ce227753221e15bfab0326a35ef05caa1.zip | |
Revert "[cmake] Fix clang builds with BUILD_SHARED=ON and CLANG_LINK_CLANG_DYLIB=ON"
This reverts commit df839cfda09dbadc26b8be635f27da75f1f27190.
This change used cmake's list filter operation which was not added
until cmake 3.6.
(cherry picked from commit 4751e4f8c24bc07fdb668dc49ee559b97c1e3c22)
| -rw-r--r-- | clang/tools/clang-shlib/CMakeLists.txt | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/clang/tools/clang-shlib/CMakeLists.txt b/clang/tools/clang-shlib/CMakeLists.txt index 16fc8a0ca29..a0fc8f6bfbd 100644 --- a/clang/tools/clang-shlib/CMakeLists.txt +++ b/clang/tools/clang-shlib/CMakeLists.txt @@ -14,17 +14,9 @@ foreach (lib ${clang_libs}) list(APPEND _OBJECTS $<TARGET_OBJECTS:obj.${lib}>) endif() list(APPEND _DEPS $<TARGET_PROPERTY:${lib},INTERFACE_LINK_LIBRARIES>) - get_target_property(interface ${lib} LINK_LIBRARIES) - if (interface) - list(APPEND _DEPS ${interface}) - endif() + list(APPEND _DEPS $<TARGET_PROPERTY:${lib},LINK_LIBRARIES>) endforeach () -# clang libraries are redundant since we are linking all the individual -# object files into libclang-cpp.so, so filter them out from _DEPS. -# This avoids problems with LLVM global data when building with -# BUILD_SHARED_LIBS=ON -list(FILTER _DEPS EXCLUDE REGEX "^clang") if (CLANG_LINK_CLANG_DYLIB) set(INSTALL_WITH_TOOLCHAIN INSTALL_WITH_TOOLCHAIN) endif() |
