Commit f174884b authored by Tony Arcieri's avatar Tony Arcieri Committed by GitHub

Merge pull request #26 from Keruspe/master

Fix finding libsodium.so with ruby 2.5
parents 0fc5ccbb 795a6987
...@@ -5,9 +5,12 @@ module RbNaCl ...@@ -5,9 +5,12 @@ module RbNaCl
module Libsodium module Libsodium
class << self class << self
def sodiumlib_dir def sodiumlib_dir
sodiumlib32_dir = File.expand_path("../../../vendor/libsodium/dist/lib/", __FILE__) dist_dirs = ["tmp/#{RUBY_PLATFORM}/stage/vendor/libsodium/dist", "vendor/libsodium/dist"]
sodiumlib64_dir = File.expand_path("../../../vendor/libsodium/dist/lib64/", __FILE__) lib_dirs = %w[lib lib64]
[sodiumlib32_dir, sodiumlib64_dir].select { |dir| Dir.exist?(dir) }.first sodiumlib_dirs = dist_dirs.product(lib_dirs).map do |dist_dir, lib_dir|
File.expand_path("../../../#{dist_dir}/#{lib_dir}/", __FILE__)
end
sodiumlib_dirs.select { |dir| Dir.exist?(dir) }.first
end end
def sodiumlib_glob def sodiumlib_glob
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment