ruby-changes:11278
From: usa <ko1@a...>
Date: Wed, 11 Mar 2009 17:41:55 +0900 (JST)
Subject: [ruby-changes:11278] Ruby:r22890 (trunk): * test/dl/test_base.rb: decide dll name of MSVCRT from RUBY_SO_NAME on native Win32 platforms.
usa 2009-03-11 17:39:37 +0900 (Wed, 11 Mar 2009) New Revision: 22890 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22890 Log: * test/dl/test_base.rb: decide dll name of MSVCRT from RUBY_SO_NAME on native Win32 platforms. [ruby-core:22828] Modified files: trunk/test/dl/test_base.rb Index: test/dl/test_base.rb =================================================================== --- test/dl/test_base.rb (revision 22889) +++ test/dl/test_base.rb (revision 22890) @@ -23,9 +23,9 @@ 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 @@ 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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/