diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-03-29 00:14:51 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-04-04 11:18:25 +0900 |
commit | 146330906f0f1cada9179b2b57501e2b64aa5eed (patch) | |
tree | a9286af428999d01a60622281c25418488045f99 | |
parent | 4a716455652d9924d8ef9b0a1527cb0bef90ee2f (diff) | |
download | ruby-146330906f0f1cada9179b2b57501e2b64aa5eed.tar.gz |
Fixed the location of the shared library
On platform where searchs shared libraries by `PATH` environment
variable (i.e., Windows), the shared library is installed in
`bindir`. On other platforms, the library directory is directed
by `libdirname` indirectly.
-rw-r--r-- | spec/ruby/library/rbconfig/rbconfig_spec.rb | 4 | ||||
-rw-r--r-- | spec/ruby/optional/capi/spec_helper.rb | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/spec/ruby/library/rbconfig/rbconfig_spec.rb b/spec/ruby/library/rbconfig/rbconfig_spec.rb index 4d6824dfb4..f88dc673e5 100644 --- a/spec/ruby/library/rbconfig/rbconfig_spec.rb +++ b/spec/ruby/library/rbconfig/rbconfig_spec.rb @@ -39,7 +39,9 @@ describe 'RbConfig::CONFIG' do guard -> {RbConfig::TOPDIR} do it "libdir/LIBRUBY_SO is the path to libruby and it exists if and only if ENABLE_SHARED" do - libdir = RbConfig::CONFIG[RbConfig::CONFIG['libdirname'] || 'libdir'] + libdirname = RbConfig::CONFIG['LIBPATHENV'] == 'PATH' ? 'bindir' : + RbConfig::CONFIG['libdirname'] + libdir = RbConfig::CONFIG[libdirname] libruby_so = "#{libdir}/#{RbConfig::CONFIG['LIBRUBY_SO']}" case RbConfig::CONFIG['ENABLE_SHARED'] when 'yes' diff --git a/spec/ruby/optional/capi/spec_helper.rb b/spec/ruby/optional/capi/spec_helper.rb index 74a6325fe0..a7029a74ed 100644 --- a/spec/ruby/optional/capi/spec_helper.rb +++ b/spec/ruby/optional/capi/spec_helper.rb @@ -32,11 +32,9 @@ def compile_extension(name) ruby_header = "#{RbConfig::CONFIG['rubyhdrdir']}/ruby.h" if RbConfig::CONFIG["ENABLE_SHARED"] == "yes" - if PlatformGuard.windows? - libruby_so = "#{RbConfig::CONFIG['bindir']}/#{RbConfig::CONFIG['LIBRUBY_SO']}" - else - libruby_so = "#{RbConfig::CONFIG['libdir']}/#{RbConfig::CONFIG['LIBRUBY_SO']}" - end + libdirname = RbConfig::CONFIG['LIBPATHENV'] == 'PATH' ? 'bindir' : + RbConfig::CONFIG['libdirname'] # defined since 2.1 + libruby_so = "#{RbConfig::CONFIG[libdirname]}/#{RbConfig::CONFIG['LIBRUBY_SO']}" end begin |