summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortduehr <tduehr@gmail.com>2016-02-01 14:09:25 -0600
committertduehr <tduehr@gmail.com>2016-02-01 14:09:25 -0600
commit250ed0d3ccc77c397fd46b65d94b6b502feb850f (patch)
tree498757bd0626764281b57b30eea03ba1c7365c07
parent856d674420fe3cca7bb47adddafcc31b2c353a12 (diff)
downloadffi-elcapt.tar.gz
fix path concatenation bugelcapt
-rw-r--r--lib/ffi/library.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ffi/library.rb b/lib/ffi/library.rb
index a6af4ed..3a7d1bd 100644
--- a/lib/ffi/library.rb
+++ b/lib/ffi/library.rb
@@ -108,6 +108,7 @@ module FFI
errors = {}
libnames.each do |libname|
+ orig = libname
begin
lib = FFI::DynamicLibrary.open(libname, lib_flags)
break if lib
@@ -124,7 +125,7 @@ module FFI
unless libname.start_with?("/")
path = Dir["{/usr{/local,},}/lib/**/#{libname}"].first
if path
- libname = path + libname
+ libname = path
retry
end
end
@@ -132,7 +133,7 @@ module FFI
if ldscript
retry
else
- errors[libname] = ex
+ errors[orig] = ex
end
end
end