diff options
| author | tduehr <tduehr@gmail.com> | 2016-07-06 11:22:20 -0500 |
|---|---|---|
| committer | tduehr <tduehr@gmail.com> | 2016-07-06 11:22:20 -0500 |
| commit | ed67c2852e8854ebdfa2482d4fb4c2edf3da21a0 (patch) | |
| tree | 8ca337818c7707e9e32572e14bf7a4ebac14300f | |
| parent | e3183e2d19fd7f01c5e07225eaaa9ea51a6ed892 (diff) | |
| download | ffi-ed67c2852e8854ebdfa2482d4fb4c2edf3da21a0.tar.gz | |
move library lookup
| -rw-r--r-- | lib/ffi/library.rb | 24 |
1 files 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 |