[RuntimeDyld][AArch64] Add explicit addends before calling relocationValueRef.

[oota-llvm.git] / lib / ExecutionEngine / Interpreter / CMakeLists.txt

diff --git a/lib/ExecutionEngine/Interpreter/CMakeLists.txt b/lib/ExecutionEngine/Interpreter/CMakeLists.txt
index 39df555d5e294c38afca882c20a4d6f042854790..4dbc2df4c74f25323075ca5c8a57b4754eecf3c5 100644 (file)
--- a/lib/ExecutionEngine/Interpreter/CMakeLists.txt
+++ b/lib/ExecutionEngine/Interpreter/CMakeLists.txt
@@ -1,15 +1,11 @@
-# If the user required a custom path for ffi headers, use it on its
-# abolute form (see config-ix.cmake):
-if( FFI_INCLUDE_DIR )
+# Make sure that the path to libffi headers is on the command
+# line. That path can be a compiler's non-default path even when
+# FFI_INCLUDE_DIR was not used, because cmake has its own paths for
+# searching for headers (CMAKE_SYSTEM_INCLUDE_PATH, for instance):
+if( FFI_INCLUDE_PATH )
   include_directories( ${FFI_INCLUDE_PATH} )
 endif()
 
-# If the user required a custom path for libffi, use it on its abolute
-# form (see config-ix.cmake):
-if( FFI_LIBRARY_DIR )
-  link_directories( ${FFI_LIBRARY_PATH} )
-endif()
-
 add_llvm_library(LLVMInterpreter
   Execution.cpp
   ExternalFunctions.cpp
@@ -17,5 +13,7 @@ add_llvm_library(LLVMInterpreter
   )
 
 if( LLVM_ENABLE_FFI )
-  target_link_libraries( LLVMInterpreter ffi )
+  target_link_libraries( LLVMInterpreter PRIVATE ${FFI_LIBRARY_PATH} )
 endif()
+
+add_dependencies(LLVMInterpreter intrinsics_gen)