diff --git a/ChangeLog b/ChangeLog index f4347ac137..18b4b5fe8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Apr 28 15:32:53 2011 NAKAMURA Usaku + + * test/dl/test_base.rb (DL::LIBC_SO): its always msvc*.dll on + mswin/mingw. + Wed Apr 27 07:42:44 2011 Nobuyoshi Nakada * configure.in (STRIP): use proper toolchain. based on a patch 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" diff --git a/version.h b/version.h index b07560717f..cd46ba548c 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 244 +#define RUBY_PATCHLEVEL 245 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1