diff options
Diffstat (limited to 'test/dl')
| -rw-r--r-- | test/dl/test_base.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/dl/test_base.rb b/test/dl/test_base.rb index 48b32cddea..d7fb354b6d 100644 --- a/test/dl/test_base.rb +++ b/test/dl/test_base.rb @@ -23,9 +23,9 @@ when /linux/ end libc_so = File.join(libdir, "libc.so.6") libm_so = File.join(libdir, "libm.so.6") -when /mingw/, /mswin32/ - libc_so = "msvcrt.dll" - libm_so = "msvcrt.dll" +when /mingw/, /mswin/ + require "rbconfig" + libc_so = libm_so = RbConfig::CONFIG["RUBY_SO_NAME"].split(/-/, 2)[0] + ".dll" when /darwin/ libc_so = "/usr/lib/libc.dylib" libm_so = "/usr/lib/libm.dylib" @@ -40,8 +40,8 @@ else end end -libc_so = nil if !libc_so || !File.file?(libc_so) -libm_so = nil if !libm_so || !File.file?(libm_so) +libc_so = nil if !libc_so || (libc_so[0] == ?/ && !File.file?(libc_so)) +libm_so = nil if !libm_so || (libm_so[0] == ?/ && !File.file?(libm_so)) if !libc_so || !libm_so ruby = EnvUtil.rubybin |