From 612fe10526f0d88318d4c6a57b2f7897b31b1f7b Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 11 Mar 2009 08:39:37 +0000 Subject: [PATCH] * test/dl/test_base.rb: decide dll name of MSVCRT from RUBY_SO_NAME on native Win32 platforms. [ruby-core:22828] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22890 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/dl/test_base.rb | 10 +++++----- 1 file 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