Author: vedantk Date: Fri Aug 19 16:00:40 2016 New Revision: 279322 URL: http://llvm.org/viewvc/llvm-project?rev=279322&view=rev Log: Revert "[lldb][cmake] Remove libclang as an lldbBase dependency (NFCI)"
This reverts commit r279296. Including LLDBDependencies breaks the netbsd lldb bot because it exposes LLDB_USED_LIBS, which causes lldb_link_common_libs to run to completion in unintended sites, which results in a malformed call to target_link_libraries. http://lab.llvm.org:8011/builders/lldb-amd64-ninja-netbsd7/builds/5989 Thanks to Chris Bieneman for figuring this out! Modified: lldb/trunk/CMakeLists.txt lldb/trunk/cmake/modules/AddLLDB.cmake Modified: lldb/trunk/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/CMakeLists.txt?rev=279322&r1=279321&r2=279322&view=diff ============================================================================== --- lldb/trunk/CMakeLists.txt (original) +++ lldb/trunk/CMakeLists.txt Fri Aug 19 16:00:40 2016 @@ -1,6 +1,5 @@ cmake_minimum_required(VERSION 3.4.3) -include(cmake/LLDBDependencies.cmake) include(cmake/modules/LLDBStandalone.cmake) include(cmake/modules/LLDBConfig.cmake) include(cmake/modules/AddLLDB.cmake) Modified: lldb/trunk/cmake/modules/AddLLDB.cmake URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/AddLLDB.cmake?rev=279322&r1=279321&r2=279322&view=diff ============================================================================== --- lldb/trunk/cmake/modules/AddLLDB.cmake (original) +++ lldb/trunk/cmake/modules/AddLLDB.cmake Fri Aug 19 16:00:40 2016 @@ -84,7 +84,10 @@ macro(add_lldb_library name) endif() endif() - add_dependencies(${name} ${CLANG_USED_LIBS}) + # Hack: only some LLDB libraries depend on the clang autogenerated headers, + # but it is simple enough to make all of LLDB depend on some of those + # headers without negatively impacting much of anything. + add_dependencies(${name} libclang) set_target_properties(${name} PROPERTIES FOLDER "lldb libraries") endmacro(add_lldb_library) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
