From: Oscar Fuentes <ofv@wanadoo.es>
Date: Fri, 28 Jan 2011 16:49:05 +0000 (+0000)
Subject: Fix libffi usage when it is on a custom path.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=abcae24d991844ac6ac33b773b1007e2e901575c;p=oota-llvm.git

Fix libffi usage when it is on a custom path.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@124486 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/ExecutionEngine/Interpreter/CMakeLists.txt b/lib/ExecutionEngine/Interpreter/CMakeLists.txt
index c8e4b6eedcd..d331f830b62 100644
--- a/lib/ExecutionEngine/Interpreter/CMakeLists.txt
+++ b/lib/ExecutionEngine/Interpreter/CMakeLists.txt
@@ -6,14 +6,6 @@ if( FFI_INCLUDE_PATH )
   include_directories( ${FFI_INCLUDE_PATH} )
 endif()
 
-# Make sure that the path to libffi archive is on the command
-# line. That path can be a linker's non-default path even when
-# FFI_LIBRARY_DIR was not used, because cmake has its own paths for
-# searching for libraries (CMAKE_SYSTEM_LIBRARY_PATH, for instance):
-if( FFI_LIBRARY_PATH )
-  link_directories( ${FFI_LIBRARY_PATH} )
-endif()
-
 add_llvm_library(LLVMInterpreter
   Execution.cpp
   ExternalFunctions.cpp
@@ -21,5 +13,5 @@ add_llvm_library(LLVMInterpreter
   )
 
 if( LLVM_ENABLE_FFI )
-  target_link_libraries( LLVMInterpreter ffi )
+  target_link_libraries( LLVMInterpreter ${FFI_LIBRARY_PATH} )
 endif()