mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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
This commit is contained in:
parent
c1e6116aee
commit
f9a973ad4f
3 changed files with 7 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
|||
Thu Apr 28 15:32:53 2011 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||
|
||||
* test/dl/test_base.rb (DL::LIBC_SO): its always msvc*.dll on
|
||||
mswin/mingw.
|
||||
|
||||
Wed Apr 27 07:42:44 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* configure.in (STRIP): use proper toolchain. based on a patch
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue