From f9a973ad4f47203e19c2abfa55b5a762d8da04bd Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 30 May 2011 04:45:09 +0000 Subject: merges r31371 from trunk into ruby_1_9_2. -- * test/dl/test_base.rb (DL::LIBC_SO): its always msvc*.dll on mswin/mingw. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31820 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/dl/test_base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/dl/test_base.rb b/test/dl/test_base.rb index 3b22ce5b57..4ba0cca6f9 100644 --- a/test/dl/test_base.rb +++ b/test/dl/test_base.rb @@ -25,7 +25,7 @@ when /linux/ libm_so = File.join(libdir, "libm.so.6") when /mingw/, /mswin/ require "rbconfig" - libc_so = libm_so = RbConfig::CONFIG["RUBY_SO_NAME"].split(/-/, 2)[0] + ".dll" + libc_so = libm_so = RbConfig::CONFIG["RUBY_SO_NAME"].split(/-/).find{|e| /^msvc/ =~ e} + ".dll" when /darwin/ libc_so = "/usr/lib/libc.dylib" libm_so = "/usr/lib/libm.dylib" -- cgit v1.2.3