From ed67c2852e8854ebdfa2482d4fb4c2edf3da21a0 Mon Sep 17 00:00:00 2001 From: tduehr Date: Wed, 6 Jul 2016 11:22:20 -0500 Subject: move library lookup --- lib/ffi/library.rb | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/ffi/library.rb b/lib/ffi/library.rb index a88e6f1..5d52edd 100644 --- a/lib/ffi/library.rb +++ b/lib/ffi/library.rb @@ -122,21 +122,21 @@ module FFI end end - # TODO better library lookup logic - libname = libname.to_s - unless libname.start_with?("/") - path = ['/usr/lib/','/usr/local/lib/'].find do |pth| - File.exist?(pth + libname) - end - if path - libname = path + libname - retry - end - end - if ldscript retry else + # TODO better library lookup logic + libname = libname.to_s + unless libname.start_with?("/") + path = ['/usr/lib/','/usr/local/lib/'].find do |pth| + File.exist?(pth + libname) + end + if path + libname = path + libname + retry + end + end + libr = (orig == libname ? orig : "#{orig} #{libname}") errors[libr] = ex end -- cgit v1.2.1