1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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
This commit is contained in:
usa 2009-03-11 08:39:37 +00:00
parent df63af6be2
commit 612fe10526

View file

@ -23,9 +23,9 @@ when /linux/
end end
libc_so = File.join(libdir, "libc.so.6") libc_so = File.join(libdir, "libc.so.6")
libm_so = File.join(libdir, "libm.so.6") libm_so = File.join(libdir, "libm.so.6")
when /mingw/, /mswin32/ when /mingw/, /mswin/
libc_so = "msvcrt.dll" require "rbconfig"
libm_so = "msvcrt.dll" libc_so = libm_so = RbConfig::CONFIG["RUBY_SO_NAME"].split(/-/, 2)[0] + ".dll"
when /darwin/ when /darwin/
libc_so = "/usr/lib/libc.dylib" libc_so = "/usr/lib/libc.dylib"
libm_so = "/usr/lib/libm.dylib" libm_so = "/usr/lib/libm.dylib"
@ -40,8 +40,8 @@ else
end end
end end
libc_so = nil if !libc_so || !File.file?(libc_so) libc_so = nil if !libc_so || (libc_so[0] == ?/ && !File.file?(libc_so))
libm_so = nil if !libm_so || !File.file?(libm_so) libm_so = nil if !libm_so || (libm_so[0] == ?/ && !File.file?(libm_so))
if !libc_so || !libm_so if !libc_so || !libm_so
ruby = EnvUtil.rubybin ruby = EnvUtil.rubybin