archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 18:13:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merges r21100 and r21107 from trunk into ruby_1_9_1.

Browse source 
* ext/dl/test/test_base.rb: use lib64 when the architecture is x86_64.
       * ext/dl/test/test_base.rb: use libc.dylib when the platform is
       darwin.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2008-12-28 09:42:17 +00:00
parent 259ed6176f
commit a90a01acee
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Sun Dec 28 12:53:10 2008 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
* ext/dl/test/test_base.rb: use libc.dylib when the platform is darwin.
Sat Dec 27 21:46:10 2008 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
* ext/dl/test/test_base.rb: use lib64 when the architecture is x86_64.
Sat Dec 27 20:26:59 2008 NAKAMURA Usaku <usa@ruby-lang.org> Sat Dec 27 20:26:59 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (rb_w32_argv_size): if an argument is empty, it's size * win32/win32.c (rb_w32_argv_size): if an argument is empty, it's size

6
ext/dl/test/test_base.rb
View file

@ -5,12 +5,18 @@ case RUBY_PLATFORM
when /cygwin/ when /cygwin/
LIBC_SO = "cygwin1.dll" LIBC_SO = "cygwin1.dll"
LIBM_SO = "cygwin1.dll" LIBM_SO = "cygwin1.dll"
when /x86_64-linux/
LIBC_SO = "/lib64/libc.so.6"
LIBM_SO = "/lib64/libm.so.6"
when /linux/ when /linux/
LIBC_SO = "/lib/libc.so.6" LIBC_SO = "/lib/libc.so.6"
LIBM_SO = "/lib/libm.so.6" LIBM_SO = "/lib/libm.so.6"
when /mingw/, /mswin32/ when /mingw/, /mswin32/
LIBC_SO = "msvcrt.dll" LIBC_SO = "msvcrt.dll"
LIBM_SO = "msvcrt.dll" LIBM_SO = "msvcrt.dll"
when /darwin/
LIBC_SO = "/usr/lib/libc.dylib"
LIBM_SO = "/usr/lib/libm.dylib"
else else
LIBC_SO = ARGV[0] LIBC_SO = ARGV[0]
LIBM_SO = ARGV[1] LIBM_SO = ARGV[1]