diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-28 09:42:17 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-28 09:42:17 +0000 |
| commit | a90a01acee452bac96ac2a5cdfdc0780c330f6b6 (patch) | |
| tree | 6000dc43554345f87b93cbeabc476eba00630eab | |
| parent | 259ed6176f32bed0e02fd3a546977efc432da755 (diff) | |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/dl/test/test_base.rb | 6 |
2 files changed, 14 insertions, 0 deletions
@@ -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> * win32/win32.c (rb_w32_argv_size): if an argument is empty, it's size diff --git a/ext/dl/test/test_base.rb b/ext/dl/test/test_base.rb index fc72db4e5e..8466812a1e 100644 --- a/ext/dl/test/test_base.rb +++ b/ext/dl/test/test_base.rb @@ -5,12 +5,18 @@ case RUBY_PLATFORM 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] |