yugui	2008-12-28 18:42:17 +0900 (Sun, 28 Dec 2008)

  New Revision: 21128

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21128

  Log:
    merges r21100 and r21107 from trunk into ruby_1_9_1.
           * 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.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/ext/dl/test/test_base.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21127)
+++ ruby_1_9_1/ChangeLog	(revision 21128)
@@ -1,3 +1,11 @@
+Sun Dec 28 12:53:10 2008  TAKANO Mitsuhiro (takano32)  <tak@n...>
+
+	* 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@n...>
+
+	* ext/dl/test/test_base.rb: use lib64 when the architecture is x86_64.
+
 Sat Dec 27 20:26:59 2008  NAKAMURA Usaku  <usa@r...>
 
 	* win32/win32.c (rb_w32_argv_size): if an argument is empty, it's size
Index: ruby_1_9_1/ext/dl/test/test_base.rb
===================================================================
--- ruby_1_9_1/ext/dl/test/test_base.rb	(revision 21127)
+++ ruby_1_9_1/ext/dl/test/test_base.rb	(revision 21128)
@@ -5,12 +5,18 @@
 when /cygwin/
   LIBC_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/
   LIBC_SO = "/lib/libc.so.6"
   LIBM_SO = "/lib/libm.so.6"
 when /mingw/, /mswin32/
   LIBC_SO = "msvcrt.dll"
   LIBM_SO = "msvcrt.dll"
+when /darwin/
+  LIBC_SO = "/usr/lib/libc.dylib"
+  LIBM_SO = "/usr/lib/libm.dylib"
 else
   LIBC_SO = ARGV[0]
   LIBM_SO = ARGV[1]

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/