Author: Tom Stellard Date: 2020-01-22T16:00:56-08:00 New Revision: df839cfda09dbadc26b8be635f27da75f1f27190
URL: https://github.com/llvm/llvm-project/commit/df839cfda09dbadc26b8be635f27da75f1f27190 DIFF: https://github.com/llvm/llvm-project/commit/df839cfda09dbadc26b8be635f27da75f1f27190.diff LOG: [cmake] Fix clang builds with BUILD_SHARED=ON and CLANG_LINK_CLANG_DYLIB=ON Summary: We were linking all the clang objects and shared libraries into libclang-cpp.so, which was causing the command line options to be registered twice. Reviewers: beanz, mgorny Reviewed By: beanz, mgorny Subscribers: mgorny, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D68520 Added: Modified: clang/tools/clang-shlib/CMakeLists.txt Removed: ################################################################################ diff --git a/clang/tools/clang-shlib/CMakeLists.txt b/clang/tools/clang-shlib/CMakeLists.txt index a0fc8f6bfbde..16fc8a0ca29b 100644 --- a/clang/tools/clang-shlib/CMakeLists.txt +++ b/clang/tools/clang-shlib/CMakeLists.txt @@ -14,9 +14,17 @@ foreach (lib ${clang_libs}) list(APPEND _OBJECTS $<TARGET_OBJECTS:obj.${lib}>) endif() list(APPEND _DEPS $<TARGET_PROPERTY:${lib},INTERFACE_LINK_LIBRARIES>) - list(APPEND _DEPS $<TARGET_PROPERTY:${lib},LINK_LIBRARIES>) + get_target_property(interface ${lib} LINK_LIBRARIES) + if (interface) + list(APPEND _DEPS ${interface}) + endif() 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() _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
