aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/fiddle/helper.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 63ef57a8eb..58653f76e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 12 14:50:52 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/dl/test_base.rb (Fiddle::LIBC_SO): its always msvc*.dll on
+ mswin/mingw.
+
Thu May 12 14:47:53 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/mkmf.rb (Logging.postpone): copy only when tmporary logfile
diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb
index b11f2e40c6..a95a43a963 100644
--- a/test/fiddle/helper.rb
+++ b/test/fiddle/helper.rb
@@ -28,7 +28,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"