[PATCH] D16940: Fix build LLVM with -D LLVM_USE_INTEL_JITEVENTS:BOOL=ON on Windows

[Andy Kaylor via llvm-commits]

andrew.w.kaylor updated this revision to Diff 47712.
andrew.w.kaylor added a comment.

Updated files based on review feedback


Repository:
  rL LLVM

http://reviews.llvm.org/D16940

Files:
  lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt
  lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt

Index: lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt
===================================================================
--- lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt
+++ lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt
@@ -1,8 +1,17 @@
 include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
 
+if( HAVE_LIBDL )
+    set(LLVM_INTEL_JIT_LIBS ${CMAKE_DL_LIBS})
+endif()
+if( HAVE_LIBPTHREAD )
+    set(LLVM_INTEL_JIT_LIBS pthread ${LLVM_INTEL_JIT_LIBS})
+endif()
+
 add_llvm_library(LLVMIntelJITEvents
   IntelJITEventListener.cpp
   jitprofiling.c
 
-  LINK_LIBS pthread ${CMAKE_DL_LIBS}
+  LINK_LIBS ${LLVM_INTEL_JIT_LIBS}
 )
+
+add_dependencies(LLVMIntelJITEvents LLVMCodeGen)
Index: lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt
===================================================================
--- lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt
+++ lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt
@@ -21,4 +21,4 @@
 type = OptionalLibrary
 name = IntelJITEvents
 parent = ExecutionEngine
-required_libraries = Core DebugInfoDWARF Support Object ExecutionEngine
+required_libraries = CodeGen Core DebugInfoDWARF Support Object ExecutionEngine


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D16940.47712.patch
Type: text/x-patch
Size: 1189 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160211/1e68ff50/attachment.bin>