Use the paths to libffi's header and library even when no custom

location was stated with FFI_INCLUDE_DIR/FFI_LIBRARY_DIR.

llvm-svn: 124449

1 files changed, 10 insertions, 6 deletions

diff --git a/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt b/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt
index 39df555d5e2..c8e4b6eedcd 100644
--- a/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt
+++ b/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt
@@ -1,12 +1,16 @@
-# 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 )
+# 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()