summaryrefslogtreecommitdiffstats
path: root/lldb/tools/intel-features
diff options
context:
space:
mode:
authorPavel Labath <labath@google.com>2017-10-31 13:23:19 +0000
committerPavel Labath <labath@google.com>2017-10-31 13:23:19 +0000
commitf753bfeeec449dcd0e56bfa98b359598e4798b1f (patch)
treeb90980fac499ccab6a8020ad07b487abe7647c34 /lldb/tools/intel-features
parentd1089e5cea535741b728e4582b0456612f626db9 (diff)
downloadbcm5719-llvm-f753bfeeec449dcd0e56bfa98b359598e4798b1f.tar.gz
bcm5719-llvm-f753bfeeec449dcd0e56bfa98b359598e4798b1f.zip
Fix LLVM_LINK_LLVM_DYLIB build (pr35053)
Summary: r316368 broke this build when it introduced a reference to a pthread function to the Utility module. This caused cmake to generate an incorrect link line (wrong order of libs) because it did not see the dependency from Utility to the system libraries. Instead these libraries were being manually added to each final target. This changes moves the dependency management from the individual targets to the lldbUtility module, which is consistent with how llvm does it. The final targets will pick up these libraries as they will be a part of the link interface of the module. Technically, some of these dependencies could go into the host module, as that's where most of the os-specific code is, but I did not try to investigate which ones. Reviewers: zturner, sylvestre.ledru Subscribers: lldb-commits, mgorny Differential Revision: https://reviews.llvm.org/D39246 llvm-svn: 316997
Diffstat (limited to 'lldb/tools/intel-features')
-rw-r--r--lldb/tools/intel-features/CMakeLists.txt3
1 files changed, 0 insertions, 3 deletions
diff --git a/lldb/tools/intel-features/CMakeLists.txt b/lldb/tools/intel-features/CMakeLists.txt
index 8c286574c66..b5316540fdf 100644
--- a/lldb/tools/intel-features/CMakeLists.txt
+++ b/lldb/tools/intel-features/CMakeLists.txt
@@ -1,5 +1,3 @@
-include(${LLDB_PROJECT_ROOT}/cmake/LLDBDependencies.cmake)
-
# Flags to control each individual feature
option(LLDB_BUILD_INTEL_MPX "Enable Building of Intel(R) Memory Protection Extensions" ON)
option(LLDB_BUILD_INTEL_PT "Enable Building of Intel(R) Processor Trace Tool" OFF)
@@ -63,7 +61,6 @@ add_lldb_library(lldbIntelFeatures SHARED
# Add link dependencies for python wrapper
if (NOT LLDB_DISABLE_PYTHON AND LLDB_BUILD_INTEL_PT)
add_dependencies(lldbIntelFeatures intel-features-swig_wrapper)
- target_link_libraries(lldbIntelFeatures PRIVATE ${LLDB_SYSTEM_LIBS})
endif()
install(TARGETS lldbIntelFeatures
OpenPOWER on IntegriCloud